Fix multidimensional inline yaml collections

simonberger · simonberger · commit 77fc10e39776 · 2020-11-06T05:39:58.000+01:00
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
@@ -1240,9 +1240,15 @@ private function lexInlineSequence(string $yaml): string
         }
 
         $value = $yaml;
+        $collectionLevel = 1;
 
         while ($this->moveToNextLine()) {
-            for ($i = 1; isset($this->currentLine[$i]) && ']' !== $this->currentLine[$i]; ++$i) {
+            for ($i = 1; isset($this->currentLine[$i]) && $collectionLevel >= 1; ++$i) {
+                if ('[' === $this->currentLine[$i]) {
+                    ++$collectionLevel;
+                } elseif (']' === $this->currentLine[$i]) {
+                    --$collectionLevel;
+                }
             }
 
             $trimmedValue = trim($this->currentLine);
@@ -1253,7 +1259,7 @@ private function lexInlineSequence(string $yaml): string
 
             $value .= $trimmedValue;
 
-            if (isset($this->currentLine[$i]) && ']' === $this->currentLine[$i]) {
+            if (0 === $collectionLevel) {
                 break;
             }
         }
diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -2465,6 +2465,18 @@ public function testParsingMultipleDocuments()
         // (before, there was no \n after row2)
         $this->assertSame(['a' => ['b' => "row\nrow2\n"], 'c' => 'd'], $this->parser->parse($longDocument));
     }
+
+    public function testParsingMultidimensionalCollectionOverMultipleLines()
+    {
+        $yaml = <<<YAML
+[
+    ["entry1", {}],
+    ["entry2"]
+]
+YAML;
+
+        $this->assertSame([['entry1', []], ['entry2']], $this->parser->parse($yaml));
+    }
 }
 
 class B

Original file line number	Diff line number	Diff line change
`@@ -1240,9 +1240,15 @@ private function lexInlineSequence(string $yaml): string`
`1240`	`1240`	`}`
`1241`	`1241`
`1242`	`1242`	`$value = $yaml;`
	`1243`	`+ $collectionLevel = 1;`
`1243`	`1244`
`1244`	`1245`	`while ($this->moveToNextLine()) {`
`1245`		`- for ($i = 1; isset($this->currentLine[$i]) && ']' !== $this->currentLine[$i]; ++$i) {`
	`1246`	`+ for ($i = 1; isset($this->currentLine[$i]) && $collectionLevel >= 1; ++$i) {`
	`1247`	`+ if ('[' === $this->currentLine[$i]) {`
	`1248`	`+ ++$collectionLevel;`
	`1249`	`+ } elseif (']' === $this->currentLine[$i]) {`
	`1250`	`+ --$collectionLevel;`
	`1251`	`+ }`
`1246`	`1252`	`}`
`1247`	`1253`
`1248`	`1254`	`$trimmedValue = trim($this->currentLine);`
`@@ -1253,7 +1259,7 @@ private function lexInlineSequence(string $yaml): string`
`1253`	`1259`
`1254`	`1260`	`$value .= $trimmedValue;`
`1255`	`1261`
`1256`		`- if (isset($this->currentLine[$i]) && ']' === $this->currentLine[$i]) {`
	`1262`	`+ if (0 === $collectionLevel) {`
`1257`	`1263`	`break;`
`1258`	`1264`	`}`
`1259`	`1265`	`}`