Fixes #22967

antograssiot · antograssiot · commit 3065764c3abe · 2018-03-03T22:08:43.000+01:00
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
@@ -421,7 +421,7 @@ private function doParse($value, $flags)
                 }
 
                 // try to parse the value as a multi-line string as a last resort
-                if (0 === $this->currentLineNb && !$this->isNextLineIndented()) {
+                if (0 === $this->currentLineNb && (!$this->isCurrentLineBlank() || !$this->isCurrentLineLastLineInDocument()) && !$this->isNextLineIndented()) {
                     $previousLineWasNewline = false;
                     $previousLineWasTerminatedWithBackslash = false;
                     $value = '';
diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -824,6 +824,20 @@ public function testMultiLineStringLastResortParsingOnlyAffectSameIndentationLev
         $this->parser->parse($yaml);
     }
 
+    /**
+     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
+     */
+    public function testMultiLineStringLastResortParsingOnlyAffectMultilineStrings()
+    {
+        $yaml = <<<'EOT'
+ &  *  !  |  >  '  "  %  @  ` #, { asd a;sdasd }-@^qw3
+ 
+ # comment
+ 
+EOT;
+        $this->parser->parse($yaml);
+    }
+
     public function testMultiLineStringLastResortParsing()
     {
         $yaml = <<<'EOT'

Original file line number	Diff line number	Diff line change
`@@ -421,7 +421,7 @@ private function doParse($value, $flags)`
`421`	`421`	`}`
`422`	`422`
`423`	`423`	`// try to parse the value as a multi-line string as a last resort`
`424`		`- if (0 === $this->currentLineNb && !$this->isNextLineIndented()) {`
	`424`	`+ if (0 === $this->currentLineNb && (!$this->isCurrentLineBlank() \|\| !$this->isCurrentLineLastLineInDocument()) && !$this->isNextLineIndented()) {`
`425`	`425`	`$previousLineWasNewline = false;`
`426`	`426`	`$previousLineWasTerminatedWithBackslash = false;`
`427`	`427`	`$value = '';`