drop comments while lexing unquoted strings

xabbuh · xabbuh · commit e56733bd3dfb · 2025-02-27T09:00:23.000+01:00
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
@@ -1158,7 +1158,18 @@ private function lexInlineQuotedString(int &$cursor = 0): string
     private function lexUnquotedString(int &$cursor): string
     {
         $offset = $cursor;
-        $cursor += strcspn($this->currentLine, '[]{},:', $cursor);
+
+        while ($cursor < strlen($this->currentLine)) {
+            if (in_array($this->currentLine[$cursor], ['[', ']', '{', '}', ',', ':'], true)) {
+                break;
+            }
+
+            if (' ' === $this->currentLine[$cursor] && isset($this->currentLine[$cursor + 1]) && '#' === $this->currentLine[$cursor + 1]) {
+                break;
+            }
+
+            ++$cursor;
+        }
 
         if ($cursor === $offset) {
             throw new ParseException('Malformed unquoted YAML string.');
diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -1751,6 +1751,19 @@ public function testParseMultiLineUnquotedString()
         $this->assertSame(['foo' => 'bar baz foobar foo', 'bar' => 'baz'], $this->parser->parse($yaml));
     }
 
+    public function testParseMultiLineUnquotedStringWithTrailingComment()
+    {
+        $yaml = <<<YAML
+{
+    foo: 3, # comment
+    bar: example.com/#about,
+    baz: 30 # comment
+}
+YAML;
+
+        $this->assertSame(['foo' => 3, 'bar' => 'example.com/#about', 'baz' => 30], $this->parser->parse($yaml));
+    }
+
     /**
      * @dataProvider escapedQuotationCharactersInQuotedStrings
      */
