[Yaml] Fix error handling on ini file parsing #22105
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
|
👍 |
|
Thank you @chalasr. |
xabbuh
added a commit
that referenced
this pull request
Mar 22, 2017
This PR was merged into the 3.3-dev branch. Discussion ---------- [Yaml] Fix error handling on ini file parsing | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a Should make travis green again on master. /cc @xabbuh Commits ------- 71cec82 [Yaml] Fix error handling in parser
|
This part of the code supports things that shouldn't be. "foo"
baris not valid. bar
"foo"is valid but should be parsed as This could be fixed by updating some things:
foreach ($lines as $line) {
if ($this->preg_match('/[ \t]+#/', $line, $match, PREG_OFFSET_CAPTURE)) {
$line = substr($line, 0, $match[0][1]);
}
if ('' === trim($line)) {
$value .= "\n";
$previousLineWasNewline = true;
} elseif ($previousLineWasNewline) {
$value .= trim($line);
$previousLineWasNewline = false;
} else {
$value .= ' '.trim($line);
$previousLineWasNewline = false;
}
} |
fabpot
added a commit
that referenced
this pull request
May 24, 2017
This PR was merged into the 3.3 branch. Discussion ---------- [Yaml] fix multiline block handling | Q | A | ------------- | --- | Branch? | 3.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #21114, #22105 (comment) | License | MIT | Doc PR | Commits ------- a2079d6 [Yaml] fix multiline block handling
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.
Should make travis green again on master.
/cc @xabbuh