bug #38229 [Yaml] fix parsing comments not prefixed by a space (xabbuh)

xabbuh · xabbuh · commit 74f41f3313b7 · 2020-09-18T11:29:40.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- [Yaml] fix parsing comments not prefixed by a space | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #38223 | License | MIT | Doc PR | Commits ------- 35b223a fix parsing comments not prefixed by a space
diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
@@ -127,7 +127,7 @@ public static function parse($value, $flags = 0, $references = [])
             }
 
             // some comments are allowed at the end
-            if (preg_replace('/\s+#.*$/A', '', substr($value, $i))) {
+            if (preg_replace('/\s*#.*$/A', '', substr($value, $i))) {
                 throw new ParseException(sprintf('Unexpected characters near "%s".', substr($value, $i)), self::$parsedLineNumber + 1, $value, self::$parsedFilename);
             }
 
diff --git a/src/Symfony/Component/Yaml/Tests/InlineTest.php b/src/Symfony/Component/Yaml/Tests/InlineTest.php
@@ -860,4 +860,14 @@ public function testParseNegativeOctalNumberContainingInvalidDigits()
     {
         self::assertSame('-0123456789', Inline::parse('-0123456789'));
     }
+
+    public function testParseCommentNotPrefixedBySpaces()
+    {
+        self::assertSame('foo', Inline::parse('"foo"#comment'));
+    }
+
+    public function testParseUnquotedStringContainingHashTagNotPrefixedBySpace()
+    {
+        self::assertSame('foo#nocomment', Inline::parse('foo#nocomment'));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ public static function parse($value, $flags = 0, $references = [])`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`// some comments are allowed at the end`
`130`		`- if (preg_replace('/\s+#.*$/A', '', substr($value, $i))) {`
	`130`	`+ if (preg_replace('/\s#.$/A', '', substr($value, $i))) {`
`131`	`131`	`throw new ParseException(sprintf('Unexpected characters near "%s".', substr($value, $i)), self::$parsedLineNumber + 1, $value, self::$parsedFilename);`
`132`	`132`	`}`
`133`	`133`
Original file line number	Diff line number	Diff line change
`@@ -860,4 +860,14 @@ public function testParseNegativeOctalNumberContainingInvalidDigits()`
`860`	`860`	`{`
`861`	`861`	`self::assertSame('-0123456789', Inline::parse('-0123456789'));`
`862`	`862`	`}`
	`863`	`+`
	`864`	`+ public function testParseCommentNotPrefixedBySpaces()`
	`865`	`+ {`
	`866`	`+ self::assertSame('foo', Inline::parse('"foo"#comment'));`
	`867`	`+ }`
	`868`	`+`
	`869`	`+ public function testParseUnquotedStringContainingHashTagNotPrefixedBySpace()`
	`870`	`+ {`
	`871`	`+ self::assertSame('foo#nocomment', Inline::parse('foo#nocomment'));`
	`872`	`+ }`
`863`	`873`	`}`