[Yaml] Throw parse error on unfinished inline map #26834
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nicolas-grekas
commented
Apr 6, 2018
| @@ -231,6 +231,9 @@ public static function parseScalar($scalar, $delimiters = null, $stringDelimiter | |||
|
|
|||
| if (null !== $delimiters) { | |||
| $tmp = ltrim(substr($scalar, $i), ' '); | |||
| if ('' === $tmp) { | |||
| throw new ParseException(sprintf('Unexpected end of line, expected one of "%s".', implode($delimiters))); | |||
There was a problem hiding this comment.
when merging on 3.4:
throw new ParseException(sprintf('Unexpected end of line, expected one of "%s".', implode($delimiters)), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
|
|
||
| /** | ||
| * @expectedException \Symfony\Component\Yaml\Exception\ParseException | ||
| * @expectedExceptionMessage Unexpected end of line, expected one of ",}". |
There was a problem hiding this comment.
when merging on 3.4:
@expectedExceptionMessage Unexpected end of line, expected one of ",}" at line 1 (near "{abc: 'def'").
xabbuh
approved these changes
Apr 8, 2018
|
Thank you @nicolas-grekas. |
xabbuh
added a commit
that referenced
this pull request
Apr 8, 2018
…-grekas) This PR was merged into the 2.7 branch. Discussion ---------- [Yaml] Throw parse error on unfinished inline map | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Throws a parse error instead of a PHP notice. Commits ------- 4359936 [Yaml] Throw parse error on unfinished inline map
This was referenced Apr 27, 2018
Merged
Merged
Merged
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Throws a parse error instead of a PHP notice.