[Component] [Yaml] [Parser] : can parse with trailing space as 2.8

jsamouh · jsamouh · commit f4f5b99dfbb5 · 2017-03-29T12:18:37.000+02:00
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,20 @@ public function testObjectsSupportDisabledWithExceptions($yaml)
         $this->parser->parse($yaml, Yaml::PARSE_EXCEPTION_ON_INVALID_TYPE);
     }
 
+    public function testCanParseContentWithTrailingSpaces()
+    {
+        $yaml = <<<YAML
+items:  
+  foo: bar
+YAML;
+
+        $expected = [
+            'items' => ['foo' => 'bar'],
+        ];
+
+        $this->assertEquals($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) {`