[Console] Input::__toString escaping fixes #7657
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
|
/cc @igorw |
| if (false !== strpos($token, ' ')) { | ||
| return '"'.$token.'"'; | ||
| if (preg_match('{^(-[^=]+=)(.+)}', $token, $match)) { | ||
| return $match[1] . (preg_match('{^[\w-]+$}', $match[2]) ? $match[2] : escapeshellarg($match[2])); |
There was a problem hiding this comment.
Extract method for escapeToken?
|
👍 |
fabpot
added a commit
that referenced
this pull request
Apr 12, 2013
This PR was merged into the master branch. Discussion ---------- [Console] Input::__toString escaping fixes Follow up to #7648, also includes a fix for StringInput to parse newlines and other whitespace chars properly instead of normalizing them all to spaces. It was kinda needed to test it properly, so I bundled both in one. Commits ------- 93b1369 [Console] Fix StringInput parsing to accept newlines and tabs 8642b67 [Console] Fix escaping of args
stof
added a commit
to stof/symfony
that referenced
this pull request
Apr 13, 2013
The PR symfony#7657 introduced a requirement on PHP 5.4 by mistake.
fabpot
added a commit
that referenced
this pull request
Apr 13, 2013
This PR was merged into the master branch. Discussion ---------- Fixed the Console code on PHP 5.3 | Q | A | ------------- | --- | Fixed tickets | none (catched by the Travis builds) | License | MIT The PR #7657 introduced a requirement on PHP 5.4 by mistake. Commits ------- 1356050 Fixed the Console code on PHP 5.3
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.
Follow up to #7648, also includes a fix for StringInput to parse newlines and other whitespace chars properly instead of normalizing them all to spaces. It was kinda needed to test it properly, so I bundled both in one.