Fix AddMissingVarNameFixer to handle intersection types in @var#33
Merged
Conversation
The type char class in VAR_WITHOUT_NAME_REGEX lacked '&', so inline @var with an intersection type (e.g. MockObject&AbstractIntegration) was skipped and never got its variable name filled in.
Member
Author
|
LGTM 👍 |
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
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.
Problem
AddMissingVarNameFixerskipped inline@varannotations with an intersection type:The variable name was never filled in.
Cause
VAR_WITHOUT_NAME_REGEXtype char class[\\\\\w\|\[\]-]+had no&, so intersection types failed to match. (The second docblock line below is not the blocker —getNextMeaningfulTokenalready skips it; a simple type with a docblock underneath fixed fine.)Fix
Add
&to the type char class. Now the annotation becomes:/** @var MockObject&AbstractIntegration $integration */New fixture
intersection_type_with_docblock_below.php.inccovers the exact reported case.phpstan / rector / ecs / phpunit all green.