symfony
diff --git a/‎src/Symfony/Component/Yaml/Parser.php
Lines changed: 23 additions & 0 deletions b/‎src/Symfony/Component/Yaml/Parser.php
Lines changed: 23 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Yaml/Tests/ParserTest.php
Lines changed: 26 additions & 0 deletions b/‎src/Symfony/Component/Yaml/Tests/ParserTest.php
Lines changed: 26 additions & 0 deletions
@@ -571,6 +571,29 @@ private function parseValue($value, $flags, $context)
         }
 
         try {
+            $quotation = '' !== $value && ('"' === $value[0] || "'" === $value[0]) ? $value[0] : null;
+
+            // do not take following lines into account when the current line is a quoted single line value
+            if (null !== $quotation && preg_match('/^'.$quotation.'.*'.$quotation.'(\s*#.*)?$/', $value)) {
+                return Inline::parse($value, $flags, $this->refs);
+            }
+
+            while ($this->moveToNextLine()) {
+                // unquoted strings end before the first unindented line
+                if (null === $quotation && $this->getCurrentLineIndentation() === 0) {
+                    $this->moveToPreviousLine();
+
+                    break;
+                }
+
+                $value .= ' '.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) {
+                    break;
+                }
+            }
+
             Inline::$parsedLineNumber = $this->getRealCurrentLineNb();
             $parsedValue = Inline::parse($value, $flags, $this->refs);
 
 
@@ -1425,6 +1425,32 @@ public function parserThrowsExceptionWithCorrectLineNumberProvider()
             ),
         );
     }
+
+    public function testParseMultiLineQuotedString()
+    {
+        $yaml = <<<EOT
+foo: "bar
+  baz
+   foobar
+foo"
+bar: baz
+EOT;
+
+        $this->assertSame(array('foo' => 'bar baz foobar foo', 'bar' => 'baz'), $this->parser->parse($yaml));
+    }
+
+    public function testParseMultiLineUnquotedString()
+    {
+        $yaml = <<<EOT
+foo: bar
+  baz
+   foobar
+  foo
+bar: baz
+EOT;
+
+        $this->assertSame(array('foo' => 'bar baz foobar foo', 'bar' => 'baz'), $this->parser->parse($yaml));
+    }
 }
 
 class B