bug #22216 [Component] [Yaml] [Parser] : can parse with trailing space as 2.8 (jordscream)

fabpot · fabpot · commit 19a9b2f29b7a · 2017-03-31T16:30:03.000+02:00
This PR was merged into the 3.3-dev branch. Discussion ---------- [Component] [Yaml] [Parser] : can parse with trailing space as 2.8 | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no  | Tests pass? | yes | Fixed tickets | #22193 | License | MIT | Doc PR | symfony/symfony-docs Missing rtrim method in line to parse as the version 2.8 does Commits ------- ce3d5ab [Component] [Yaml] [Parser] : can parse with trailing space as 2.8
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
@@ -175,7 +175,7 @@ public function parse($value, $flags = 0)
                     $this->refs[$isRef] = end($data);
                 }
             } elseif (
-                self::preg_match('#^(?P<key>'.Inline::REGEX_QUOTED_STRING.'|(?:![^\s]++\s++)?[^ \'"\[\{!].*?) *\:(\s++(?P<value>.+))?$#u', $this->currentLine, $values)
+                self::preg_match('#^(?P<key>'.Inline::REGEX_QUOTED_STRING.'|(?:![^\s]++\s++)?[^ \'"\[\{!].*?) *\:(\s++(?P<value>.+))?$#u', rtrim($this->currentLine), $values)
                 && (false === strpos($values['key'], ' #') || in_array($values['key'][0], array('"', "'")))
             ) {
                 if ($context && 'sequence' == $context) {
diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -602,6 +602,17 @@ public function testObjectsSupportDisabledWithExceptions($yaml)
         $this->parser->parse($yaml, Yaml::PARSE_EXCEPTION_ON_INVALID_TYPE);
     }
 
+    public function testCanParseContentWithTrailingSpaces()
+    {
+        $yaml = "items:  \n  foo: bar";
+
+        $expected = array(
+            'items' => array('foo' => 'bar'),
+        );
+
+        $this->assertSame($expected, $this->parser->parse($yaml));
+    }
+
     /**
      * @group legacy
      * @dataProvider invalidDumpedObjectProvider

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ public function parse($value, $flags = 0)`
`175`	`175`	`$this->refs[$isRef] = end($data);`
`176`	`176`	`}`
`177`	`177`	`} elseif (`
`178`		`- self::preg_match('#^(?P<key>'.Inline::REGEX_QUOTED_STRING.'\|(?:![^\s]++\s++)?[^ \'"\[\{!].?) \:(\s++(?P<value>.+))?$#u', $this->currentLine, $values)`
	`178`	`+ self::preg_match('#^(?P<key>'.Inline::REGEX_QUOTED_STRING.'\|(?:![^\s]++\s++)?[^ \'"\[\{!].?) \:(\s++(?P<value>.+))?$#u', rtrim($this->currentLine), $values)`
`179`	`179`	`&& (false === strpos($values['key'], ' #') \|\| in_array($values['key'][0], array('"', "'")))`
`180`	`180`	`) {`
`181`	`181`	`if ($context && 'sequence' == $context) {`