[Yaml] Fix Yaml Parser with quote end in a new line

maxbeckers · nicolas-grekas · commit 50250dc3a79a · 2022-12-13T11:51:05.000+01:00
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
@@ -656,6 +656,9 @@ private function getNextEmbedBlock(int $indentation = null, bool $inSequence = f
             if ($this->isCurrentLineBlank()) {
                 $data[] = substr($this->currentLine, $newIndent);
                 continue;
+            } elseif ($this->isCurrentLineQuoteEnd()) {
+                $data[] = $this->currentLine;
+                continue;
             }
 
             if ($indent >= $newIndent) {
@@ -977,6 +980,14 @@ private function isCurrentLineBlank(): bool
         return '' === $this->currentLine || '' === trim($this->currentLine, ' ');
     }
 
+    /**
+     * Returns true if the current line is end of a quote.
+     */
+    private function isCurrentLineQuoteEnd(): bool
+    {
+        return \in_array(trim($this->currentLine), ["'", '"']);
+    }
+
     /**
      * Returns true if the current line is a comment line.
      */
diff --git a/src/Symfony/Component/Yaml/Tests/YamlTest.php b/src/Symfony/Component/Yaml/Tests/YamlTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Yaml\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Yaml\Exception\ParseException;
 use Symfony\Component\Yaml\Yaml;
 
 class YamlTest extends TestCase
@@ -24,6 +25,37 @@ public function testParseAndDump()
         $this->assertEquals($data, $parsed);
     }
 
+    public function testParseWithMultilineQuotes()
+    {
+        $yaml = <<<YAML
+foo:
+  bar: 'baz
+
+'
+  baz: 'Lorem
+
+       ipsum'
+  foobar: 'foobar'
+YAML;
+
+        $this->assertSame(['foo' => ['bar' => "baz\n", 'baz' => "Lorem\nipsum", 'foobar' => 'foobar']], Yaml::parse($yaml));
+    }
+
+    public function testParseWithMultilineQuotesExpectException()
+    {
+        $yaml = <<<YAML
+foo:
+  bar: 'baz
+
+'
+'
+YAML;
+
+        $this->expectException(ParseException::class);
+        $this->expectExceptionMessage('Unable to parse at line 5 (near "\'").');
+        Yaml::parse($yaml);
+    }
+
     public function testZeroIndentationThrowsException()
     {
         $this->expectException(\InvalidArgumentException::class);
