symfony
diff --git a/‎src/Symfony/Component/Yaml/Parser.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Yaml/Parser.php
+2-1Lines changed: 2 additions & 1 deletion b/‎src/Symfony/Component/Yaml/Parser.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Yaml/Parser.php
+2-1Lines changed: 2 additions & 1 deletion
diff --git a/‎src/Symfony/Component/Yaml/Tests/ParserTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Yaml/Tests/ParserTest.php
+27Lines changed: 27 additions & 0 deletions b/‎src/Symfony/Component/Yaml/Tests/ParserTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Yaml/Tests/ParserTest.php
+27Lines changed: 27 additions & 0 deletions
@@ -757,7 +757,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;
                 }
             }
 
@@ -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
`@@ -757,7 +757,8 @@ private function parseValue($value, $flags, $context)`
`757`	`757`	`$lines[] = trim($this->currentLine);`
`758`	`758`
`759`	`759`	`// quoted string values end with a line that is terminated with the quotation character`
`760`		`- if ('' !== $this->currentLine && substr($this->currentLine, -1) === $quotation) {`
	`760`	`+ $escapedLine = str_replace(['\\\\', '\\"'], '', $this->currentLine);`
	`761`	`+ if ('' !== $escapedLine && substr($escapedLine, -1) === $quotation) {`
`761`	`762`	`break;`
`762`	`763`	`}`
`763`	`764`	`}`