Skip to content

Commit cce8075

Browse files
authored
[DeadCode] Remove AstResolver on RemoveParentCallWithoutParentRector (#8032)
1 parent 75ee094 commit cce8075

1 file changed

Lines changed: 16 additions & 7 deletions

File tree

‎rules/DeadCode/Rector/StaticCall/RemoveParentCallWithoutParentRector.php‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@
1212
use PhpParser\Node\Name\FullyQualified;
1313
use PhpParser\Node\Stmt\Class_;
1414
use PhpParser\Node\Stmt\Expression;
15+
use PHPStan\Reflection\ClassReflection;
1516
use PHPStan\Reflection\ReflectionProvider;
1617
use Rector\Enum\ObjectReference;
1718
use Rector\NodeAnalyzer\ClassAnalyzer;
1819
use Rector\NodeManipulator\ClassMethodManipulator;
19-
use Rector\PhpParser\AstResolver;
2020
use Rector\Rector\AbstractRector;
21+
use Rector\Reflection\ClassReflectionAnalyzer;
2122
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
2223
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
2324

@@ -30,7 +31,7 @@ public function __construct(
3031
private readonly ClassMethodManipulator $classMethodManipulator,
3132
private readonly ClassAnalyzer $classAnalyzer,
3233
private readonly ReflectionProvider $reflectionProvider,
33-
private readonly AstResolver $astResolver
34+
private readonly ClassReflectionAnalyzer $classReflectionAnalyzer
3435
) {
3536
}
3637

@@ -183,15 +184,23 @@ private function hasUnresolvableAncestor(Name $parentName): bool
183184
return true;
184185
}
185186

186-
$parentClass = $this->astResolver->resolveClassFromName($parentClassName);
187-
if (! $parentClass instanceof Class_) {
187+
$parentClassReflection = $this->reflectionProvider->getClass($parentClassName);
188+
189+
return $this->hasUnresolvableParentClass($parentClassReflection);
190+
}
191+
192+
private function hasUnresolvableParentClass(ClassReflection $classReflection): bool
193+
{
194+
$parentClassName = $this->classReflectionAnalyzer->resolveParentClassName($classReflection);
195+
if ($parentClassName === null) {
188196
return false;
189197
}
190198

191-
if (! $parentClass->extends instanceof Name) {
192-
return false;
199+
$parentClassReflection = $classReflection->getParentClass();
200+
if (! $parentClassReflection instanceof ClassReflection) {
201+
return true;
193202
}
194203

195-
return $this->hasUnresolvableAncestor($parentClass->extends);
204+
return $this->hasUnresolvableParentClass($parentClassReflection);
196205
}
197206
}

0 commit comments

Comments
 (0)