[Yaml] Fix escaped quotes in quoted multi-line string

ossinkine · ossinkine · commit 2e99caacafd2 · 2020-05-07T22:33:48.000+05:00
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
@@ -751,7 +751,8 @@ private function parseValue($value, $flags, $context)
                 $lines[] = trim($this->currentLine);
 
                 // quoted string values end with a line that is terminated with the quotation character
-                if ('' !== $this->currentLine && substr($this->currentLine, -1) === $quotation) {
+                $escapedLine = str_replace(['\\\\', '\\"'], '', $this->currentLine);
+                if ('' !== $escapedLine && substr($escapedLine, -1) === $quotation) {
                     break;
                 }
             }
diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -1650,6 +1650,33 @@ public function testBlankLinesInQuotedMultiLineString()
         $this->assertSame($expected, $this->parser->parse($yaml));
     }
 
+    public function testEscapedQuoteInQuotedMultiLineString()
+    {
+        $yaml = <<<YAML
+foobar: "foo
+    \\"bar\\"
+    baz"
+YAML;
+        $expected = [
+            'foobar' => 'foo "bar" baz',
+        ];
+
+        $this->assertSame($expected, $this->parser->parse($yaml));
+    }
+
+    public function testBackslashInQuotedMultiLineString()
+    {
+        $yaml = <<<YAML
+foobar: "foo
+    bar\\\\"
+YAML;
+        $expected = [
+            'foobar' => 'foo bar\\',
+        ];
+
+        $this->assertSame($expected, $this->parser->parse($yaml));
+    }
+
     public function testParseMultiLineUnquotedString()
     {
         $yaml = <<<EOT

Original file line number	Diff line number	Diff line change
`@@ -751,7 +751,8 @@ private function parseValue($value, $flags, $context)`
`751`	`751`	`$lines[] = trim($this->currentLine);`
`752`	`752`
`753`	`753`	`// quoted string values end with a line that is terminated with the quotation character`
`754`		`- if ('' !== $this->currentLine && substr($this->currentLine, -1) === $quotation) {`
	`754`	`+ $escapedLine = str_replace(['\\\\', '\\"'], '', $this->currentLine);`
	`755`	`+ if ('' !== $escapedLine && substr($escapedLine, -1) === $quotation) {`
`755`	`756`	`break;`
`756`	`757`	`}`
`757`	`758`	`}`