Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Squiz/ControlStructureSpacing: bug fix - allow for PHPCS annotation tokens #1836

Conversation

jrfnl
Copy link
Contributor

@jrfnl jrfnl commented Jan 5, 2018

Treat the new // phpcs: comments in the same way as "ordinary" T_COMMENT tokens.

Includes unit test.

Related to #1817, which was recently fixed in a7d4118. This commit builds onto that fix.

Without the fix, the NoLineAfterClose error would not be reported when there is a phpcs: comment after a control structure close brace and the needed fix would not be applied.

…okens

Treat the new `// phpcs:` comments in the same way as "ordinary" `T_COMMENT` tokens.

Includes unit test.

Related to 1817, which was recently fixed in a7d4118. This commit builds onto that fix.

Without the fix, the `NoLineAfterClose` error would not be reported when there is a `phpcs:` comment after a control structure close brace and the needed fix would not be applied.
@gsherwood gsherwood added this to the 3.2.3 milestone Jan 5, 2018
@gsherwood gsherwood merged commit c32cec6 into squizlabs:master Jan 5, 2018
gsherwood added a commit that referenced this pull request Jan 5, 2018
@gsherwood
Copy link
Member

Thanks 👍

@jrfnl jrfnl deleted the feature/squiz-controlstructurespacing-phpcs-annotations branch January 5, 2018 02:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants