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

Fix conflict between header_comment and declare_strict_types #4895

Merged
merged 2 commits into from
Apr 10, 2020

Conversation

julienfalque
Copy link
Member

Fixes #3467.

/cc @BackEndTea

@julienfalque julienfalque added the RTM Ready To Merge label Apr 10, 2020
@keradus keradus added this to the 2.15.6 milestone Apr 10, 2020
BackEndTea and others added 2 commits April 10, 2020 14:34
The priority test is to make sure no old behaviour gets broken
the misc one is to make sure we fix the bug.

Plus tests for the header coment fixer itself if chosen to go that way
@keradus keradus force-pushed the fix-header-declare-conflict branch from 73528e8 to ee98411 Compare April 10, 2020 12:34
@keradus keradus removed the RTM Ready To Merge label Apr 10, 2020
@keradus
Copy link
Member

keradus commented Apr 10, 2020

Thank you @julienfalque.

@keradus keradus merged commit 2463eff into PHP-CS-Fixer:2.15 Apr 10, 2020
@julienfalque julienfalque deleted the fix-header-declare-conflict branch April 10, 2020 18:38
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

5 participants