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/FunctionDeclarationArgumentSpacing: fix fixer conflict #1712

Conversation

jrfnl
Copy link
Contributor

@jrfnl jrfnl commented Oct 15, 2017

Came across this error when running fixer conflict checks for the various standards. (See #1645 (comment) )
Fifth fix in a series to fix the issues found.

When a function declaration contains comments, the FunctionDeclarationArgumentSpacing sniff would mistakingly see them as type hints, causing a fixer conflict between that sniff and the PEAR.Functions.FunctionDeclaration/Squiz.Functions.MultiLineFunctionDeclaration sniff.

Includes unit test demonstrating the issue.

When a function declaration contains comments, the `FunctionDeclarationArgumentSpacing` sniff would mistakingly see them as type hints, causing a fixer conflict between that sniff and the `PEAR.Functions.FunctionDeclaration`/`Squiz.Functions.MultiLineFunctionDeclaration` sniff.

Includes unit test demonstrating the issue.
@jrfnl jrfnl force-pushed the feature/squiz-functiondeclaration-argspacing-conflict branch from 258e80c to ba08109 Compare November 22, 2017 05:55
@jrfnl
Copy link
Contributor Author

jrfnl commented Nov 22, 2017

Rebased for merge conflicts & updated code style...

@gsherwood gsherwood added this to the 3.2.0 milestone Nov 28, 2017
@gsherwood gsherwood merged commit ba08109 into squizlabs:master Nov 28, 2017
gsherwood added a commit that referenced this pull request Nov 28, 2017
@gsherwood
Copy link
Member

Thanks

@jrfnl jrfnl deleted the feature/squiz-functiondeclaration-argspacing-conflict branch November 29, 2017 00:36
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