bug #21084 [Yaml] handle empty lines inside unindented collection (xabbuh)

fabpot · fabpot · commit 942e0c170616 · 2017-01-03T05:44:39.000-08:00
This PR was merged into the 2.7 branch. Discussion ---------- [Yaml] handle empty lines inside unindented collection | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #21005 | License | MIT | Doc PR | Commits ------- bbfe6f7 handle empty lines inside unindented collection
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
@@ -423,7 +423,7 @@ private function getNextEmbedBlock($indentation = null, $inSequence = false)
 
             $previousLineIndentation = $indent;
 
-            if ($isItUnindentedCollection && !$this->isStringUnIndentedCollectionItem() && $newIndent === $indent) {
+            if ($isItUnindentedCollection && !$this->isCurrentLineEmpty() && !$this->isStringUnIndentedCollectionItem() && $newIndent === $indent) {
                 $this->moveToPreviousLine();
                 break;
             }
diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -189,6 +189,22 @@ public function getBlockChompingTests()
         );
         $tests['Literal block chomping clip with multiple trailing newlines'] = array($expected, $yaml);
 
+        $yaml = <<<'EOF'
+foo:
+- bar: |
+    one
+
+    two
+EOF;
+        $expected = array(
+            'foo' => array(
+                array(
+                    'bar' => "one\n\ntwo",
+                ),
+            ),
+        );
+        $tests['Literal block chomping clip with embedded blank line inside unindented collection'] = array($expected, $yaml);
+
         $yaml = <<<'EOF'
 foo: |
     one

Original file line number	Diff line number	Diff line change
`@@ -423,7 +423,7 @@ private function getNextEmbedBlock($indentation = null, $inSequence = false)`
`423`	`423`
`424`	`424`	`$previousLineIndentation = $indent;`
`425`	`425`
`426`		`- if ($isItUnindentedCollection && !$this->isStringUnIndentedCollectionItem() && $newIndent === $indent) {`
	`426`	`+ if ($isItUnindentedCollection && !$this->isCurrentLineEmpty() && !$this->isStringUnIndentedCollectionItem() && $newIndent === $indent) {`
`427`	`427`	`$this->moveToPreviousLine();`
`428`	`428`	`break;`
`429`	`429`	`}`