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

Support for phpstan and psaml prefixes on @method #302

Merged
merged 2 commits into from Aug 20, 2020

Conversation

yosatak
Copy link
Contributor

@yosatak yosatak commented Aug 19, 2020

About one month after #279, there was a conflict, so I repaired it.
@bastien-phi and @ondrejmirtes. I will take over the correspondence of this PR.

@bastien-phi
Copy link

@yosatak Sorry about that... I just completely forgot that PR. My bad !

I fixed the conflict in #279

@yosatak
Copy link
Contributor Author

yosatak commented Aug 19, 2020

Thanks for the fix!

Let's continue the discussion with #279

@yosatak yosatak closed this Aug 19, 2020
@ondrejmirtes ondrejmirtes reopened this Aug 19, 2020
@ondrejmirtes
Copy link
Member

There was still conflict in #279 so I'd much prefer this one. I'll do the review.

Copy link
Member

@ondrejmirtes ondrejmirtes left a comment

Choose a reason for hiding this comment

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

Hi, the @phpstan-method tag also needs to be added to InvalidPHPStanDocTagRule. Otherwise I like it 👍

@ondrejmirtes
Copy link
Member

Please solve the conflict by rebasing, I don't want "Merge branch 'master' into..." commit.

@yosatak
Copy link
Contributor Author

yosatak commented Aug 20, 2020

Thank you for the review!
Fixed InvalidPHPStanDocTagRule and rebase on master.

@ondrejmirtes ondrejmirtes merged commit 2335152 into phpstan:master Aug 20, 2020
@ondrejmirtes
Copy link
Member

Thank you!

@bastien-phi
Copy link

@ondrejmirtes You are completely right, this one is much better than #279 !

@yosatak You did a great job !

Thank you both for that !

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