NotificationsYou must be signed in to change notification settings
Fork9.7k
Star30.8k

Commit74f41f3

committed

bug#38229 [Yaml] fix parsing comments not prefixed by a space (xabbuh)

This PR was merged into the 3.4 branch.Discussion----------[Yaml] fix parsing comments not prefixed by a space| Q | A| ------------- | ---| Branch? | 3.4| Bug fix? | yes| New feature? | no| Deprecations? | no| Tickets |Fix#38223| License | MIT| Doc PR |Commits-------35b223a fix parsing comments not prefixed by a space

2 parentsba65757 +35b223a commit74f41f3Copy full SHA for 74f41f3

File tree

2 files changed

+11

-1

lines changed

src/Symfony/Component/Yaml
- Inline.php
- Tests
  - InlineTest.php

2 files changed

+11

-1

lines changed

`‎src/Symfony/Component/Yaml/Inline.php‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ public static function parse($value, $flags = 0, $references = [])`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`// some comments are allowed at the end`
`130`		`-if (preg_replace('/\s+#.*$/A','',substr($value,$i))) {`
	`130`	`+if (preg_replace('/\s#.$/A','',substr($value,$i))) {`
`131`	`131`	`thrownewParseException(sprintf('Unexpected characters near "%s".',substr($value,$i)),self::$parsedLineNumber +1,$value,self::$parsedFilename);`
`132`	`132`	`}`
`133`	`133`

`‎src/Symfony/Component/Yaml/Tests/InlineTest.php‎`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -860,4 +860,14 @@ public function testParseNegativeOctalNumberContainingInvalidDigits()`
`860`	`860`	`{`
`861`	`861`	`self::assertSame('-0123456789', Inline::parse('-0123456789'));`
`862`	`862`	`}`
	`863`	`+`
	`864`	`+publicfunctiontestParseCommentNotPrefixedBySpaces()`
	`865`	`+ {`
	`866`	`+self::assertSame('foo', Inline::parse('"foo"#comment'));`
	`867`	`+ }`
	`868`	`+`
	`869`	`+publicfunctiontestParseUnquotedStringContainingHashTagNotPrefixedBySpace()`
	`870`	`+ {`
	`871`	`+self::assertSame('foo#nocomment', Inline::parse('foo#nocomment'));`
	`872`	`+ }`
`863`	`873`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit74f41f3

File tree

2 files changed

2 files changed

`‎src/Symfony/Component/Yaml/Inline.php‎`

`‎src/Symfony/Component/Yaml/Tests/InlineTest.php‎`

0 commit comments