Skip to content

Navigation Menu

Sign in

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

[Yaml] parse empty sequence elements as null #58279

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 17, 2024
Merged

[Yaml] parse empty sequence elements as null #58279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions 8 src/Symfony/Component/Yaml/Inline.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -403,6 +410,7 @@ private static function parseSequence(string $sequence, int $flags, int &$i = 0,

$output[] = $value;

$lastToken = 'value';
++$i;
}

Expand Down
7 changes: 7 additions & 0 deletions 7 src/Symfony/Component/Yaml/Tests/InlineTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]'));
xabbuh marked this conversation as resolved.
Show resolved Hide resolved
$this->assertSame(['foo', 'bar'], Inline::parse('[foo, bar, ]'));
}
}
Loading
Morty Proxy This is a proxified and sanitized view of the page, visit original site.