[Yaml] Align unquoted multiline scalar parsing with spec for comments

yoeunes · yoeunes · commit fb61e7dc7544 · 2025-11-15T11:45:44.000+01:00
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
@@ -775,7 +775,7 @@ private function parseValue(string $value, int $flags, string $context): mixed
                         }
 
                         if ($this->isCurrentLineComment()) {
-                            continue;
+                            break;
                         }
 
                         $lines[] = trim($this->currentLine);
diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -1752,35 +1752,32 @@ public function testParseMultiLineUnquotedString()
     }
 
     /**
-     * @dataProvider getUnquotedMultilineScalarIgnoresCommentsData
+     * @dataProvider getUnquotedMultilineScalarHandlesCommentsAndBlanksData
      */
-    public function testUnquotedMultilineScalarIgnoresComments(string $yaml, array $expected)
+    public function testUnquotedMultilineScalarHandlesCommentsAndBlanks(string $yaml, array $expected)
     {
         $this->assertSame($expected, $this->parser->parse($yaml));
     }
 
-    public static function getUnquotedMultilineScalarIgnoresCommentsData()
+    public static function getUnquotedMultilineScalarHandlesCommentsAndBlanksData()
     {
-        yield 'comments interspersed' => [
+        yield 'comments interspersed stops scalar' => [
             <<<YAML
                 key: unquoted
-                  # this comment should be ignored
-                  next line
-                  # another comment
-                  final line
+                    # this comment terminates
                 another_key: works
                 YAML,
             [
-                'key' => 'unquoted next line final line',
+                'key' => 'unquoted',
                 'another_key' => 'works',
             ],
         ];
 
         yield 'only comments' => [
             <<<YAML
                 key: unquoted
-                  # this comment should be ignored
-                  # another comment
+                    # this comment terminates
+                    # this is just another comment
                 another_key: works
                 YAML,
             [
@@ -1789,26 +1786,25 @@ public static function getUnquotedMultilineScalarIgnoresCommentsData()
             ],
         ];
 
-        yield 'blank lines and comments' => [
+        yield 'blank lines are preserved and comment stops scalar' => [
             <<<YAML
                 key: unquoted
-                  next line
+                    next line
 
-                  # this comment should be ignored
-                  final line
+                    # this comment terminates the scalar
                 another_key: works
                 YAML,
             [
-                'key' => "unquoted next line\nfinal line",
+                'key' => 'unquoted next line',
                 'another_key' => 'works',
             ],
         ];
 
-        yield 'comment at end' => [
+        yield 'comment at end stops scalar' => [
             <<<YAML
                 key: unquoted
-                  next line
-                  # comment at end
+                    next line
+                    # comment at end
                 another_key: works
                 YAML,
             [

Original file line number	Diff line number	Diff line change
`@@ -775,7 +775,7 @@ private function parseValue(string $value, int $flags, string $context): mixed`
`775`	`775`	`}`
`776`	`776`
`777`	`777`	`if ($this->isCurrentLineComment()) {`
`778`		`- continue;`
	`778`	`+ break;`
`779`	`779`	`}`
`780`	`780`
`781`	`781`	`$lines[] = trim($this->currentLine);`