[Reflection] Remove parent lookup on ReflectionResolver (#4169)

* [Reflection] Remove parent lookup on ReflectionResolver * increase kernel cache key
rectorphp · Jun 11, 2023 · ea2ee12 · ea2ee12
1 parent d541d1a
commit ea2ee12
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/src/Kernel/RectorKernel.php b/src/Kernel/RectorKernel.php
@@ -17,7 +17,7 @@ final class RectorKernel
     /**
      * @var string
      */
-    private const CACHE_KEY = 'v89';
+    private const CACHE_KEY = 'v90';
 
     private ContainerInterface|null $container = null;
 

diff --git a/src/Reflection/ReflectionResolver.php b/src/Reflection/ReflectionResolver.php
@@ -26,7 +26,6 @@
 use Rector\Core\Exception\ShouldNotHappenException;
 use Rector\Core\NodeAnalyzer\ClassAnalyzer;
 use Rector\Core\PhpParser\AstResolver;
-use Rector\Core\PhpParser\Node\BetterNodeFinder;
 use Rector\Core\PHPStan\Reflection\TypeToCallReflectionResolver\TypeToCallReflectionResolverRegistry;
 use Rector\Core\ValueObject\MethodName;
 use Rector\NodeNameResolver\NodeNameResolver;
@@ -41,7 +40,6 @@ final class ReflectionResolver
 
     public function __construct(
         private readonly ReflectionProvider $reflectionProvider,
-        private readonly BetterNodeFinder $betterNodeFinder,
         private readonly NodeTypeResolver $nodeTypeResolver,
         private readonly NodeNameResolver $nodeNameResolver,
         private readonly TypeToCallReflectionResolverRegistry $typeToCallReflectionResolverRegistry,
@@ -195,16 +193,12 @@ public function resolveFunctionLikeReflectionFromCall(
 
     public function resolveMethodReflectionFromClassMethod(ClassMethod $classMethod): ?MethodReflection
     {
-        $classLike = $this->betterNodeFinder->findParentType($classMethod, ClassLike::class);
-        if (! $classLike instanceof ClassLike) {
-            return null;
-        }
-
-        $className = $this->nodeNameResolver->getName($classLike);
-        if (! is_string($className)) {
+        $classReflection = $this->resolveClassReflection($classMethod);
+        if (! $classReflection instanceof ClassReflection) {
             return null;
         }
 
+        $className = $classReflection->getName();
         $methodName = $this->nodeNameResolver->getName($classMethod);
         $scope = $classMethod->getAttribute(AttributeKey::SCOPE);