[Yaml] properly handle unindented collections

symfony · fabpot · May 23, 2016 · May 22, 2016 · May 22, 2016 · 717e1a9e47d0899efcb65676cf10285a43a03a23
commit 717e1a9e47d0899efcb65676cf10285a43a03a23
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
@@ -711,7 +711,7 @@ private function isNextLineUnIndentedCollection()
      */
     private function isStringUnIndentedCollectionItem()
     {
-        return 0 === strpos($this->currentLine, '- ');
+        return '-' === rtrim($this->currentLine) || 0 === strpos($this->currentLine, '- ');
     }
 
     /**

diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -557,6 +557,34 @@ public function testSequenceInAMapping()
         );
     }
 
+    public function testSequenceInMappingStartedBySingleDashLine()
+    {
+        $yaml = <<<EOT
+a:
+-
+  b:
+  -
+    bar: baz
+- foo
+d: e
+EOT;
+        $expected = array(
+            'a' => array(
+                array(
+                    'b' => array(
+                        array(
+                            'bar' => 'baz',
+                        ),
+                    ),
+                ),
+                'foo',
+            ),
+            'd' => 'e',
+        );
+
+        $this->assertSame($expected, $this->parser->parse($yaml));
+    }
+
     /**
      * @expectedException \Symfony\Component\Yaml\Exception\ParseException
      */
-Original file line number
+Diff line change
@@ Expand Up / @@ -711,7 +711,7 @@ private function isNextLineUnIndentedCollection() @@
          */
         private function isStringUnIndentedCollectionItem()
         {
-            return 0 === strpos($this->currentLine, '- ');
+            return '-' === rtrim($this->currentLine) || 0 === strpos($this->currentLine, '- ');
         }
         /**
@@ Expand Down @@