[Yaml] Fix regression handling blank lines in unquoted scalars

yoeunes · yoeunes · commit 1480a235ac05 · 2025-12-02T12:50:18.000+01:00
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
@@ -762,11 +762,6 @@ private function parseValue(string $value, int $flags, string $context): mixed
                     $lines = [];
 
                     while ($this->moveToNextLine()) {
-                        if ($this->isCurrentLineBlank()) {
-                            $lines[] = '';
-                            continue;
-                        }
-
                         // unquoted strings end before the first unindented line
                         if (0 === $this->getCurrentLineIndentation()) {
                             $this->moveToPreviousLine();
@@ -778,6 +773,10 @@ private function parseValue(string $value, int $flags, string $context): mixed
                             break;
                         }
 
+                        if ('mapping' === $context && str_contains($this->currentLine, ': ') && !$this->isCurrentLineComment()) {
+                            throw new ParseException('A colon cannot be used in an unquoted mapping value.', $this->getRealCurrentLineNb() + 1, $this->currentLine, $this->filename);
+                        }
+
                         $lines[] = trim($this->currentLine);
                     }
 
diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -1829,6 +1829,77 @@ public function testUnquotedMultilineScalarThrowsOnOrphanedLineAfterComment()
         $this->parser->parse($yaml);
     }
 
+    public function testUnquotedMultilineScalarWithBlankLines()
+    {
+        $yaml = <<<YAML
+foo:
+  line 1
+
+  line 2
+YAML;
+        $this->assertSame(['foo' => "line 1\nline 2"], $this->parser->parse($yaml));
+    }
+
+    /**
+     * @dataProvider provideInvalidYamlFiles
+     */
+    public function testLineNumberInException(int $expectedLine, string $yaml, string $message)
+    {
+        $this->expectException(ParseException::class);
+        $this->expectExceptionMessage($message);
+        $this->expectExceptionMessage(\sprintf('at line %d', $expectedLine));
+
+        $this->parser->parse($yaml);
+    }
+
+    public static function provideInvalidYamlFiles(): iterable
+    {
+        yield 'invalid_nested_under_scalar' => [
+            4,
+            <<<YAML
+en:
+  NONAMESPACE: Include Entity without Namespace
+  Invalid: Foo
+    About: 'About us'
+    - Invalid
+YAML,
+            'Unable to parse',
+        ];
+
+        yield 'invalid_nested_under_scalar_with_trailing_newlines' => [
+            4,
+            <<<YAML
+en:
+  NONAMESPACE: Include Entity without Namespace
+  Invalid: Foo
+    About: 'About us'
+    - Invalid
+
+
+YAML,
+            'Unable to parse',
+        ];
+
+        yield 'colon_in_unquoted_value' => [
+            2,
+            <<<YAML
+foo: bar
+  baz: qux
+YAML,
+            'A colon cannot be used in an unquoted mapping value',
+        ];
+
+        yield 'colon_in_unquoted_value_multiline' => [
+            2,
+            <<<YAML
+foo:
+  bar
+  baz: qux
+YAML,
+            'Mapping values are not allowed in multi-line blocks',
+        ];
+    }
+
     /**
      * @dataProvider unquotedStringWithTrailingComment
      */
