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

MultipleStatementAlignment: do not break on comments within arrays. #1848

Conversation

jrfnl
Copy link
Contributor

@jrfnl jrfnl commented Jan 11, 2018

Multi-line arrays interspersed with comments were treated differently than multi-line arrays without comments.

This aligns the behaviour of both to be the same.

Includes unit tests.

Multi-line arrays interspersed with comments were treated differently than multi-line arrays without comments.

This aligns the behaviour of both to be the same.

Includes unit tests.
@jrfnl jrfnl force-pushed the feature/generic-multistatementalignment-phpcs-annotations branch from 12ab2d1 to 8386ad3 Compare February 3, 2018 17:04
@jrfnl
Copy link
Contributor Author

jrfnl commented Feb 3, 2018

Rebased for merge conflict with commit f65239d which basically does the same as this PR does for arrays, but then for closures and anonymous classes.

@jrfnl
Copy link
Contributor Author

jrfnl commented Feb 3, 2018

@gsherwood I believe this one should go in the 3.2.3 release as it addresses an issue with the new annotations (though the same issue existed before then for comments and as reported in #1870 for closures and the likes).

@gsherwood gsherwood added this to the 3.2.3 milestone Feb 4, 2018
@gsherwood gsherwood merged commit 8386ad3 into squizlabs:master Feb 4, 2018
gsherwood added a commit that referenced this pull request Feb 4, 2018
@gsherwood
Copy link
Member

Thanks

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