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

Jump to bottom

PhpdocTypesOrderFixer - Improve nested types support #6063

Merged
merged 2 commits into from Jan 20, 2022
Merged

PhpdocTypesOrderFixer - Improve nested types support #6063

merged 2 commits into from Jan 20, 2022

Conversation

julienfalque
Copy link
Member

@julienfalque julienfalque commented Oct 9, 2021 •
edited

Fixes #5850, #5921 and replaces #5919. It also improves nested union types support.

@julienfalque julienfalque mentioned this pull request Oct 9, 2021
Closed
@coveralls
Copy link

coveralls commented Oct 9, 2021 •
edited

Coverage Status

Coverage increased (+0.02%) to 93.17% when pulling 0c76fe5 on julienfalque:phpdoc-order-type-nested into 333f15e on FriendsOfPHP:master.

@julienfalque julienfalque force-pushed the phpdoc-order-type-nested branch 2 times, most recently from a19f9ad to 6ceb7e4 Compare October 15, 2021 17:52
@julienfalque julienfalque marked this pull request as ready for review October 15, 2021 17:52
kubawerlos
kubawerlos approved these changes Oct 15, 2021
View reviewed changes
Copy link
Contributor

@kubawerlos kubawerlos left a comment

Choose a reason for hiding this comment

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

Outstanding regular expression. Or scary. Or both 🙇🏼‍♂️

@franmomu franmomu mentioned this pull request Oct 17, 2021
Merged
keradus
keradus reviewed Oct 18, 2021
View reviewed changes
src/DocBlock/TypeExpression.php
@@ -31,39 +32,47 @@ final class TypeExpression
public const REGEX_TYPES = '
Copy link
Member

Choose a reason for hiding this comment

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

i believe it's time (outside of this PR) to start looking for external library managing types parsing

@julienfalque julienfalque mentioned this pull request Nov 16, 2021
Closed
@drupol
Copy link
Contributor

drupol commented Nov 21, 2021

I tested this branch on a project and I can't wait for this to be merged.

What's left to do ? I might dedicate some time to get this in asap! Thanks

@julienfalque
Copy link
Member Author

Maybe more review would be nice to be more confident this won't break things, any help is welcome :)

@keradus did you review this fully?

@julienfalque julienfalque mentioned this pull request Dec 11, 2021
Closed
@keradus
Copy link
Member

keradus commented Dec 13, 2021 •
edited

unfortunately not at all, was focusing on PHP8.1/Symfony6 reviews. maybe someone else can review this PR?

@julienfalque
Copy link
Member Author

@kubawerlos already did. Given that several people reported the changes in this PR fixed the issue for them, I consider this can be merged.

@julienfalque julienfalque mentioned this pull request Dec 19, 2021
Closed
@mollierobbert
Copy link
Contributor

Please do merge it! :-) Our team is waiting for this change as well.

@SpacePossum
Copy link
Contributor

@julienfalque please resolve the conflict, squash and than tag this PR RTM when the tests are green, thanks 👍 : )

@julienfalque julienfalque added the RTM Ready To Merge label Jan 15, 2022
@SpacePossum
Copy link
Contributor

SpacePossum commented Jan 20, 2022 •
edited

Thank you @ruudk and @julienfalque :)

@SpacePossum SpacePossum merged commit ed38f3f into PHP-CS-Fixer:master Jan 20, 2022
@SpacePossum SpacePossum removed the RTM Ready To Merge label Jan 20, 2022
@julienfalque julienfalque deleted the phpdoc-order-type-nested branch January 20, 2022 09:20
@SpacePossum SpacePossum mentioned this pull request Jan 21, 2022
Closed
@andyexeter andyexeter mentioned this pull request Mar 1, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sebastianbergmann sebastianbergmann sebastianbergmann left review comments

@keradus keradus keradus left review comments

@kubawerlos kubawerlos kubawerlos approved these changes

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

Successfully merging this pull request may close these issues.

PhpdocTypesOrderFixer false positive
9 participants
@julienfalque @coveralls @drupol @keradus @mollierobbert @SpacePossum @sebastianbergmann @kubawerlos @ruudk