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

ConcatWithoutSpacesFixer, OperatorsSpacesFixer- fix too many spaces, fix incorrect fixing of lines with comments #2092

Merged
merged 1 commit into from Jul 23, 2016
Merged

ConcatWithoutSpacesFixer, OperatorsSpacesFixer- fix too many spaces, fix incorrect fixing of lines with comments #2092

merged 1 commit into from Jul 23, 2016

Conversation

SpacePossum
Copy link
Contributor

closes #1589

Should apply without any problems on 1.12,
however on 1.12 there are two fixers with a CS problem that will be fixed by the fixers changed in this PR. So on merging upstream please fix the CS there (guess who the author is of those two fixers with the CS problem... ;) ).

@keradus keradus changed the title ConcatWithoutSpacesFixer - OperatorsSpacesFixer- Fix to many spaces, fix incorrect fixing of lines with comments. ConcatWithoutSpacesFixer - OperatorsSpacesFixer- Fix too many spaces, fix incorrect fixing of lines with comments Jul 23, 2016
@keradus keradus changed the title ConcatWithoutSpacesFixer - OperatorsSpacesFixer- Fix too many spaces, fix incorrect fixing of lines with comments ConcatWithoutSpacesFixer, OperatorsSpacesFixer- fix too many spaces, fix incorrect fixing of lines with comments Jul 23, 2016
@keradus keradus added this to the v1.11.7 milestone Jul 23, 2016
@keradus keradus merged commit 245d14a into PHP-CS-Fixer:1.11 Jul 23, 2016
keradus added a commit that referenced this pull request Jul 23, 2016
…y spaces, fix incorrect fixing of lines with comments (SpacePossum)

This PR was merged into the 1.11 branch.

Discussion
----------

ConcatWithoutSpacesFixer, OperatorsSpacesFixer- fix too many spaces, fix incorrect fixing of lines with comments

closes #1589

Should apply without any problems on 1.12,
however on 1.12 there are two fixers with a CS problem that will be fixed by the fixers changed in this PR. So on merging upstream please fix the CS there (guess who the author is of those two fixers with the CS problem... ;) ).

Commits
-------

245d14a ConcatWithoutSpacesFixer, OperatorsSpacesFixer- fix too many spaces, fix incorrect fixing of lines with comments
@keradus
Copy link
Member

keradus commented Jul 23, 2016

great work, thanks @SpacePossum !

@keradus keradus deleted the 1_11_bug_1589_concat_spaces_multi_line_with_comments branch July 23, 2016 20:08
array(
'<?php [1, 2] + //
[3, 4];',
'<?php [1, 2] + //
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

trailing spaces, fixed on 1.12, ignored on 1.11

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants