Skip to content

[Yaml] Fix parsing of unquoted strings in Parser::lexUnquotedString() to ignore spaces #59312

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.

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
Jan 1, 2025

Conversation

Link1515
Copy link
Contributor

Q A
Branch? 6.4
Bug fix? yes
New feature? no
Deprecations? no
Issues Fix #59299
License MIT

I modified the strcspn() call in the lexUnquotedString() method of the Parser class to exclude the space character (' ') from the list of delimiters. This ensures that spaces are no longer considered while parsing unquoted strings.

@carsonbot
Copy link

Hey!

I see that this is your first PR. That is great! Welcome!

Symfony has a contribution guide which I suggest you to read.

In short:

  • Always add tests
  • Keep backward compatibility (see https://symfony.com/bc).
  • Bug fixes must be submitted against the lowest maintained branch where they apply (see https://symfony.com/releases)
  • Features and deprecations must be submitted against the 7.3 branch.

Review the GitHub status checks of your pull request and try to solve the reported issues. If some tests are failing, try to see if they are failing because of this change.

When two Symfony core team members approve this change, it will be merged and you will become an official Symfony contributor!
If this PR is merged in a lower version branch, it will be merged up to all maintained branches within a few days.

I am going to sit back now and wait for the reviews.

Cheers!

Carsonbot

public function testWrappedUnquotedStringWithMultipleSpacesInValue(string $yaml, array $expected)
{
$this->assertSame($expected, $this->parser->parse($yaml));
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please add a blank line after the closing curly brace

Copy link
Member

@xabbuh xabbuh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

with some minor CS remarks

{
$this->assertSame($expected, $this->parser->parse($yaml));
}
public static function WrappedUnquotedStrings() {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
public static function WrappedUnquotedStrings() {
public static function wrappedUnquotedStringsProvider()
{

@@ -1710,6 +1710,32 @@ public function testBackslashInQuotedMultiLineString()
$this->assertSame($expected, $this->parser->parse($yaml));
}

/**
* @dataProvider WrappedUnquotedStrings
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
* @dataProvider WrappedUnquotedStrings
* @dataProvider wrappedUnquotedStringsProvider

}
public static function WrappedUnquotedStrings() {
return [
'CurlyBraces' => [
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
'CurlyBraces' => [
'mapping' => [

'fiz' => 'cat cat',
]
],
'SquareBraces' => [
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
'SquareBraces' => [
'sequence' => [

@Link1515
Copy link
Contributor Author

@xabbuh Thank you for taking the time to review my PR! I really appreciate your feedback and have made the suggested changes. Let me know if there's anything else to adjust!

@xabbuh
Copy link
Member

xabbuh commented Jan 1, 2025

Thank you @Link1515.

@xabbuh xabbuh merged commit 96941db into symfony:6.4 Jan 1, 2025
11 checks passed
This was referenced Jan 29, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Symfony YAML parsing yaml results are incorrect
3 participants