Fix ignore comment handling for multiple traits in a single file#4804
Open
takaram wants to merge 3 commits intophpstan:2.1.xfrom
Open
Fix ignore comment handling for multiple traits in a single file#4804takaram wants to merge 3 commits intophpstan:2.1.xfrom
takaram wants to merge 3 commits intophpstan:2.1.xfrom
Conversation
staabm
reviewed
Jan 27, 2026
Comment on lines
+16
to
+17
| use Foo; | ||
| use Baz; |
Contributor
There was a problem hiding this comment.
in phpstan/phpstan#13945 its reported that the errors emitted depend on the order of this use-statements.
I think it would be good than, to additional test this with use in different order
ondrejmirtes
requested changes
Jan 27, 2026
| $linesToIgnore[$scope->getFileDescription()] = $this->getLinesToIgnoreFromTokens([$traitNode]); | ||
| $fileDescription = $scope->getFileDescription(); | ||
| $linesToIgnore[$fileDescription] ??= []; | ||
| $linesToIgnore[$fileDescription] += $this->getLinesToIgnoreFromTokens([$traitNode]); |
Member
There was a problem hiding this comment.
Can you please explain what's happening here? $scope->getFileDescription() should be unique per trait usage.
Contributor
Author
There was a problem hiding this comment.
The value of $scope->getFileDescription() contains:
- File path where the trait is defined
- Name of the class which
uses the trait
It does not contain trait name, so is not necessarily unique when a file has two or more traits.
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.
$linesToIgnoredata was not correctly gathered when:Closes phpstan/phpstan#13945