PEAR/FunctionDeclaration: bug fix x 2 - prevent fixer creating a parse error + prevent fixer conflict#3739
Closed
jrfnl wants to merge 2 commits intosquizlabs:masterfrom
Conversation
Contributor
Author
jrfnl
force-pushed
the
feature/3736-pear-functiondeclaration-fix-fixer-creating-parse-error
branch
from
b6d2141 to
fda8199
Compare
…se error Issue as described in 3736. The fixer would try to remove superfluous whitespace remaining after the move of the opening brace to the previous line, but did not take into account that there may not be any whitespace to removed, i.e. that the `$opener +1` token could be the same as the `$next` token. Fixed now. Includes unit test. Fixes 3736
If a return type declaration was not confined to one line, the sniff could have a fixer conflict with itself. The fixer would also potentially remove a close curly on the same line, causing parse errors. Fixed now. The diff will be most straight forward to review while ignoring whitespace changes. Includes unit tests.
jrfnl
force-pushed
the
feature/3736-pear-functiondeclaration-fix-fixer-creating-parse-error
branch
from
fda8199 to
a498afb
Compare
Contributor
Author
|
Rebased without changed to get rid of conflicts after the merge of #3787. |
Contributor
Author
|
Closing as replaced by PHPCSStandards/PHP_CodeSniffer#52 |
jrfnl
deleted the
feature/3736-pear-functiondeclaration-fix-fixer-creating-parse-error
branch
Contributor
Author
|
FYI: this fix is included in today's PHP_CodeSniffer 3.8.0 release. As per #3932, development on PHP_CodeSniffer will continue in the PHPCSStandards/PHP_CodeSniffer repository. If you want to stay informed, you may want to start "watching" that repo (or watching releases from that repo). |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
PEAR/FunctionDeclaration: bug fix - prevent fixer from creating a parse error
Issue as described in #3736.
The fixer would try to remove superfluous whitespace remaining after the move of the opening brace to the previous line, but did not take into account that there may not be any whitespace to removed, i.e. that the
$opener +1token could be the same as the$nexttoken.Fixed now.
Includes unit test.
Fixes #3736
PEAR/FunctionDeclaration: prevent fixer conflict
This commit was originally pulled as part of PR #3661.
If a return type declaration was not confined to one line, the sniff could have a fixer conflict with itself.
The fixer would also potentially remove a close curly on the same line, causing parse errors.
Fixed now. The diff will be most straight forward to review while ignoring whitespace changes.
Includes unit tests.