PSR2/UseDeclaration: allow comments after the last USE statement #1893
Conversation
This file contains 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
jrfnl
reviewed
Feb 10, 2018
| @@ -142,7 +142,7 @@ public function process(File $phpcsFile, $stackPtr) | |||
| return; | |||
| } | |||
|
|
|||
| $next = $phpcsFile->findNext(T_WHITESPACE, ($end + 1), null, true); | |||
| $next = $phpcsFile->findNext([T_WHITESPACE, T_PHPCS_IGNORE, T_COMMENT], ($end + 1), null, true); | |||
There was a problem hiding this comment.
You may want to use Tokens::$EmptyTokens instead for completeness.
There was a problem hiding this comment.
Thanks. Updated!
iammattcoleman
force-pushed
the
fix-UseDeclarationSniff-commentLastLine
branch
from
d7dc100 to
b569625
Compare
iammattcoleman
force-pushed
the
fix-UseDeclarationSniff-commentLastLine
branch
from
b569625 to
f147caf
Compare
jrfnl
approved these changes
Feb 10, 2018
|
Thanks a lot for fixing this, and for the test. |
|
This appears to have caused a regression, please see #1898 |
dhensby
added a commit
to dhensby/PHP_CodeSniffer
that referenced
this pull request
Feb 15, 2018
|
OK - the regression here is that this allows you to do: use Class; // commentbut it now causes this to fail: use Class;
//commentBecause the test fixture tried to evaluate both at once it appeared to fix the problem, but it actually caused a regression instead |
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.
Resolves #1891