bug symfony#52408 [Yaml] Fix block scalar array parsing (NickSdot)

nicolas-grekas · nicolas-grekas · commit fc2295474840 · 2023-11-02T10:17:48.000+01:00
This PR was merged into the 5.4 branch. Discussion ---------- [Yaml] Fix block scalar array parsing | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | | License | MIT Commits ------- 1a58df8 Fix block scalar array parsing
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
@@ -199,9 +199,8 @@ private function doParse(string $value, int $flags)
                             || self::preg_match('#^(?P<key>'.Inline::REGEX_QUOTED_STRING.'|[^ \'"\{\[].*?) *\:(\s+(?P<value>.+?))?\s*$#u', $this->trimTag($values['value']), $matches)
                         )
                     ) {
-                        // this is a compact notation element, add to next block and parse
                         $block = $values['value'];
-                        if ($this->isNextLineIndented()) {
+                        if ($this->isNextLineIndented() || isset($matches['value']) && '>-' === $matches['value']) {
                             $block .= "\n".$this->getNextEmbedBlock($this->getCurrentLineIndentation() + \strlen($values['leadspaces']) + 1);
                         }
 
@@ -949,6 +948,10 @@ private function isNextLineIndented(): bool
         } while (!$EOF && ($this->isCurrentLineEmpty() || $this->isCurrentLineComment()));
 
         if ($EOF) {
+            for ($i = 0; $i < $movements; ++$i) {
+                $this->moveToPreviousLine();
+            }
+
             return false;
         }
 
diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -2690,6 +2690,44 @@ public static function circularReferenceProvider()
         return $tests;
     }
 
+    public function testBlockScalarArray()
+    {
+        $yaml = <<<'YAML'
+anyOf:
+  - $ref: >-
+      #/string/bar
+anyOfMultiline:
+  - $ref: >-
+      #/string/bar
+      second line
+nested:
+  anyOf:
+    - $ref: >-
+        #/string/bar
+YAML;
+        $expected = [
+            'anyOf' => [
+                0 => [
+                    '$ref' => '#/string/bar',
+                ],
+            ],
+            'anyOfMultiline' => [
+                0 => [
+                    '$ref' => '#/string/bar second line',
+                ],
+            ],
+            'nested' => [
+                'anyOf' => [
+                    0 => [
+                        '$ref' => '#/string/bar',
+                    ],
+                ],
+            ],
+        ];
+
+        $this->assertSame($expected, $this->parser->parse($yaml));
+    }
+
     /**
      * @dataProvider indentedMappingData
      */

Original file line number	Diff line number	Diff line change
`@@ -199,9 +199,8 @@ private function doParse(string $value, int $flags)`
`199`	`199`	`\|\| self::preg_match('#^(?P<key>'.Inline::REGEX_QUOTED_STRING.'\|[^ \'"\{\[].?) \:(\s+(?P<value>.+?))?\s*$#u', $this->trimTag($values['value']), $matches)`
`200`	`200`	`)`
`201`	`201`	`) {`
`202`		`- // this is a compact notation element, add to next block and parse`
`203`	`202`	`$block = $values['value'];`
`204`		`- if ($this->isNextLineIndented()) {`
	`203`	`+ if ($this->isNextLineIndented() \|\| isset($matches['value']) && '>-' === $matches['value']) {`
`205`	`204`	`$block .= "\n".$this->getNextEmbedBlock($this->getCurrentLineIndentation() + \strlen($values['leadspaces']) + 1);`
`206`	`205`	`}`
`207`	`206`
`@@ -949,6 +948,10 @@ private function isNextLineIndented(): bool`
`949`	`948`	`} while (!$EOF && ($this->isCurrentLineEmpty() \|\| $this->isCurrentLineComment()));`
`950`	`949`
`951`	`950`	`if ($EOF) {`
	`951`	`+ for ($i = 0; $i < $movements; ++$i) {`
	`952`	`+ $this->moveToPreviousLine();`
	`953`	`+ }`
	`954`	`+`
`952`	`955`	`return false;`
`953`	`956`	`}`
`954`	`957`