parse empty sequence elements as null

xabbuh · symfonyaml · commit 37b922f016e4 · 2024-10-21T16:39:37.000+02:00
diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
@@ -355,11 +355,18 @@ private static function parseSequence(string $sequence, int $flags, int &$i = 0,
         ++$i;
 
         // [foo, bar, ...]
+        $lastToken = null;
         while ($i < $len) {
             if (']' === $sequence[$i]) {
                 return $output;
             }
             if (',' === $sequence[$i] || ' ' === $sequence[$i]) {
+                if (',' === $sequence[$i] && (null === $lastToken || 'separator' === $lastToken)) {
+                    $output[] = null;
+                } elseif (',' === $sequence[$i]) {
+                    $lastToken = 'separator';
+                }
+
                 ++$i;
 
                 continue;
@@ -403,6 +410,7 @@ private static function parseSequence(string $sequence, int $flags, int &$i = 0,
 
             $output[] = $value;
 
+            $lastToken = 'value';
             ++$i;
         }
 
diff --git a/src/Symfony/Component/Yaml/Tests/InlineTest.php b/src/Symfony/Component/Yaml/Tests/InlineTest.php
@@ -1004,4 +1004,11 @@ public function testParseQuotedReferenceLikeStringsInSequence()
 
         $this->assertSame(['&foo', '&bar', '&baz'], Inline::parse($yaml));
     }
+
+    public function testParseSequenceWithEmptyElement()
+    {
+        $this->assertSame(['foo', null, 'bar'], Inline::parse('[foo, , bar]'));
+        $this->assertSame([null, 'foo', 'bar'], Inline::parse('[, foo, bar]'));
+        $this->assertSame(['foo', 'bar'], Inline::parse('[foo, bar, ]'));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -1004,4 +1004,11 @@ public function testParseQuotedReferenceLikeStringsInSequence()`
`1004`	`1004`
`1005`	`1005`	`$this->assertSame(['&foo', '&bar', '&baz'], Inline::parse($yaml));`
`1006`	`1006`	`}`
	`1007`	`+`
	`1008`	`+ public function testParseSequenceWithEmptyElement()`
	`1009`	`+ {`
	`1010`	`+ $this->assertSame(['foo', null, 'bar'], Inline::parse('[foo, , bar]'));`
	`1011`	`+ $this->assertSame([null, 'foo', 'bar'], Inline::parse('[, foo, bar]'));`
	`1012`	`+ $this->assertSame(['foo', 'bar'], Inline::parse('[foo, bar, ]'));`
	`1013`	`+ }`
`1007`	`1014`	`}`