fix parsing comments not prefixed by a space

symfony · Sep 18, 2020 · 50f080d · 50f080d
1 parent e6f16d8
commit 50f080d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/Inline.php b/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/Tests/InlineTest.php b/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'));
+    }
 }