Fixed PHPCS annotations in multi-line tab-indented comments + not ignoring whole line for phpcs:set #1901
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
…i-line block comments not recognized
…nnotation is complete line This fixes a situation where a `phpcs:set` could be used at the end of a line and the whole line was always being ignored. ```php do_something(); //phpcs:set Standard.Category.Sniff propertyName value ``` I wasn't sure where to add a unit test for this as there did not seem to be any for `phpcs:set` in the `errorSuppression.Test.php` file.
gsherwood
changed the title
|
Thanks for both of these fixes |
jrfnl
deleted the
feature/tokenizer-phpcs-annotations-various-minor-improvements
branch
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.
This PR should go into
3.2.3as it fixes two bugs in how the tokenizer deals with the new PHPCS annotations.This PR will be easiest to review by looking at each commit individually.
Bug 1:
PHPCS annotations in tab-indented multi-line block comments were not recognized nor tokenized correctly.
Includes extensive unit tests.
Bug 2:
A
phpcs:setwould always cause the whole line to be ignored, even when it's used as an end-comment.As
phpcs:setannotations are not covered in the unit test file, I wasn't sure were to add the tests for this.Other:
While staring at the code I saw a few minor other optimizations/typos, those have been fixed in separate commits.