bug #39274 [Yaml] fix lexing mapping values with trailing whitespaces (xabbuh)

derrabus · derrabus · commit 7882c4a0b11e · 2020-12-01T21:08:57.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [Yaml] fix lexing mapping values with trailing whitespaces | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #39265 (comment) | License | MIT | Doc PR | Commits ------- 5e455f3 fix lexing mapping values with trailing whitespaces
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
@@ -753,10 +753,10 @@ private function parseValue(string $value, int $flags, string $context)
             switch ($value[0] ?? '') {
                 case '"':
                 case "'":
-                    $cursor = \strlen($this->currentLine) - \strlen($value);
+                    $cursor = \strlen(rtrim($this->currentLine)) - \strlen(rtrim($value));
                     $parsedValue = Inline::parse($this->lexInlineQuotedString($cursor), $flags, $this->refs);
 
-                    if (isset($this->currentLine[$cursor]) && preg_replace('/\s*#.*$/A', '', substr($this->currentLine, $cursor))) {
+                    if (isset($this->currentLine[$cursor]) && preg_replace('/\s*(#.*)?$/A', '', substr($this->currentLine, $cursor))) {
                         throw new ParseException(sprintf('Unexpected characters near "%s".', substr($this->currentLine, $cursor)));
                     }
 
diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -2671,7 +2671,7 @@ public function testParseValueWithNegativeModifiers()
         );
     }
 
-    public function testMultipleWhitespaceAtEndOfLine()
+    public function testWhitespaceAtEndOfLine()
     {
         $yaml = "\nfoo:\n    arguments: [ '@bar' ]  \n";
         $this->assertSame(
@@ -2692,6 +2692,14 @@ public function testMultipleWhitespaceAtEndOfLine()
             ],
             $this->parser->parse($yaml)
         );
+
+        $this->assertSame(
+            [
+                'foo' => 'bar',
+                'foobar' => 'baz',
+            ],
+            $this->parser->parse("foo: 'bar' \nfoobar: baz")
+        );
     }
 
     /**
