Support for phpstan and psaml prefixes on @method#302
Merged
ondrejmirtes merged 2 commits intophpstan:masterfrom Aug 20, 2020
Merged
Support for phpstan and psaml prefixes on @method#302ondrejmirtes merged 2 commits intophpstan:masterfrom
ondrejmirtes merged 2 commits intophpstan:masterfrom
Conversation
Contributor
Author
|
Thanks for the fix! Let's continue the discussion with #279 |
Member
|
There was still conflict in #279 so I'd much prefer this one. I'll do the review. |
ondrejmirtes
requested changes
Aug 19, 2020
Member
ondrejmirtes
left a comment
There was a problem hiding this comment.
Hi, the @phpstan-method tag also needs to be added to InvalidPHPStanDocTagRule. Otherwise I like it 👍
Member
|
Please solve the conflict by rebasing, I don't want "Merge branch 'master' into..." commit. |
006c071 to
e38bc39
Compare
Contributor
Author
|
Thank you for the review! |
Member
|
Thank you! |
|
@ondrejmirtes You are completely right, this one is much better than #279 ! @yosatak You did a great job ! Thank you both for that ! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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.