Skip to content

Resolve class reflection lazily in property promotion rename #8546

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.

Sign up for GitHub

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

Closed
TomasVotruba wants to merge 1 commit into from
Closed

Resolve class reflection lazily in property promotion rename #8546

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions rules/Naming/PropertyRenamer/PropertyPromotionRenamer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,11 @@ public function renamePropertyPromotion(Class_ $class): bool
return false;
}

$classReflection = $this->reflectionResolver->resolveClassReflection($class);
if (! $classReflection instanceof ClassReflection) {
return false;
}
// only needed for the trait usage check below; resolving it requires scope,
// which is missing right after another rule rewrote the class
$classReflection = $class->getTraitUses() === []
? null
: $this->reflectionResolver->resolveClassReflection($class);

// resolve possible and existing param names
$blockingParamNames = $this->resolveBlockingParamNames($constructClassMethod);
Expand Down Expand Up @@ -94,7 +95,10 @@ public function renamePropertyPromotion(Class_ $class): bool
continue;
}

if ($this->propertyManipulator->isUsedByTrait($classReflection, $currentParamName)) {
if ($classReflection instanceof ClassReflection && $this->propertyManipulator->isUsedByTrait(
$classReflection,
$currentParamName
)) {
continue;
}

Expand Down
Loading