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.

Sign up for GitHub

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

Jump to bottom

PhpdocTypesOrderFixer - fix for intersection types #6243

Merged
merged 1 commit into from Feb 4, 2022
Merged

PhpdocTypesOrderFixer - fix for intersection types #6243

merged 1 commit into from Feb 4, 2022
+60 −10

Conversation

kubawerlos
Copy link
Contributor

Fixes #6238

@coveralls
Copy link

coveralls commented Jan 14, 2022 •
edited

Coverage Status

Coverage increased (+0.0007%) to 93.172% when pulling 0a19733 on werlos:fix_PhpdocTypesOrderFixer into 5a463a5 on FriendsOfPHP:master.

@kubawerlos kubawerlos marked this pull request as ready for review January 14, 2022 19:52
@kubawerlos kubawerlos mentioned this pull request Jan 15, 2022
Closed
Jean85
Jean85 suggested changes Jan 15, 2022
View reviewed changes
Copy link
Contributor

@Jean85 Jean85 left a comment

Choose a reason for hiding this comment

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

Great work! I'll close my PR instead, this is a lot more nuanced. Only one small suggestion...

tests/Fixer/Phpdoc/PhpdocTypesOrderFixerTest.php Show resolved Hide resolved
@Jean85 Jean85 mentioned this pull request Jan 15, 2022
Closed
@GaryPEGEOT GaryPEGEOT mentioned this pull request Jan 18, 2022
Closed
@SpacePossum
Copy link
Contributor

@kubawerlos please rebase, lets see how the changes of 0c76fe5 effect/compliment your work here, thanks 👍

dbu
dbu approved these changes Jan 24, 2022
View reviewed changes
Copy link

@dbu dbu left a comment

Choose a reason for hiding this comment

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

any chance to get this merged and released soon?

@SpacePossum
Copy link
Contributor

Thank you @kubawerlos.

@SpacePossum SpacePossum merged commit 55aec39 into PHP-CS-Fixer:master Feb 4, 2022
@kubawerlos kubawerlos deleted the fix_PhpdocTypesOrderFixer branch February 4, 2022 15:29
@emodric
Copy link

emodric commented Feb 7, 2022

Hi, will this be released soon?

Thanks!

@Jean85
Copy link
Contributor

Jean85 commented Mar 7, 2022

FYI this has been released in 3.6.0

This was referenced Mar 25, 2022
Closed
Merged
leofeyer pushed a commit to contao/contao that referenced this pull request Mar 28, 2022
@driftingly @ausi
Enable the PhpdocTypesOrderFixer again (see #4395)
7e31869 
Description
-----------

This can be enabled now that PHP-CS-Fixer/PHP-CS-Fixer#6243 has been merged.

Originally added [here](4849881#diff-a95817c1c2b59c07bf78b5c0565bdf836c7459dee80a13573ae1689c04440040).

I originally created PR #4392 but couldn't seem to switch the base branch.

Commits
-------

66f400f Enable PhpdocTypesOrderFixer
05cc6c6 Update ecs

Co-authored-by: Martin Auswöger <martin@auswoeger.com>
leofeyer pushed a commit to contao/manager-bundle that referenced this pull request Mar 28, 2022
@driftingly @ausi
Enable the PhpdocTypesOrderFixer again (see #4395)
1ce09a8 
Description
-----------

This can be enabled now that PHP-CS-Fixer/PHP-CS-Fixer#6243 has been merged.

Originally added [here](contao/contao@4849881#diff-a95817c1c2b59c07bf78b5c0565bdf836c7459dee80a13573ae1689c04440040).

I originally created PR contao/contao#4392 but couldn't seem to switch the base branch.

Commits
-------

66f400f0 Enable PhpdocTypesOrderFixer
05cc6c6c Update ecs

Co-authored-by: Martin Auswöger <martin@auswoeger.com>
leofeyer pushed a commit to contao/installation-bundle that referenced this pull request Mar 28, 2022
@driftingly @ausi
Enable the PhpdocTypesOrderFixer again (see #4395)
f3aef05 
Description
-----------

This can be enabled now that PHP-CS-Fixer/PHP-CS-Fixer#6243 has been merged.

Originally added [here](contao/contao@4849881#diff-a95817c1c2b59c07bf78b5c0565bdf836c7459dee80a13573ae1689c04440040).

I originally created PR contao/contao#4392 but couldn't seem to switch the base branch.

Commits
-------

66f400f0 Enable PhpdocTypesOrderFixer
05cc6c6c Update ecs

Co-authored-by: Martin Auswöger <martin@auswoeger.com>
leofeyer pushed a commit to contao/core-bundle that referenced this pull request Mar 28, 2022
@driftingly @ausi
Enable the PhpdocTypesOrderFixer again (see #4395)
0a617a0 
Description
-----------

This can be enabled now that PHP-CS-Fixer/PHP-CS-Fixer#6243 has been merged.

Originally added [here](contao/contao@4849881#diff-a95817c1c2b59c07bf78b5c0565bdf836c7459dee80a13573ae1689c04440040).

I originally created PR contao/contao#4392 but couldn't seem to switch the base branch.

Commits
-------

66f400f0 Enable PhpdocTypesOrderFixer
05cc6c6c Update ecs

Co-authored-by: Martin Auswöger <martin@auswoeger.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Jean85 Jean85 Jean85 requested changes

@SpacePossum SpacePossum SpacePossum left review comments

@dbu dbu dbu approved these changes

@tjveldhuizen tjveldhuizen tjveldhuizen approved these changes

Assignees
No one assigned
Labels
kind/bug
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

phpdoc_types_order bug with intersection type
7 participants
@kubawerlos @coveralls @SpacePossum @emodric @Jean85 @dbu @tjveldhuizen