[TypeDeclaration] Remove parent lookup on ReturnTypeInferer (#4172)

rules/TypeDeclaration/TypeInferer/ReturnTypeInferer.php

@@ -10,7 +10,6 @@
 use PhpParser\Node\Expr\Closure;
 use PhpParser\Node\Expr\Yield_;
 use PhpParser\Node\FunctionLike;
-use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Function_;
 use PhpParser\Node\Stmt\Return_;
@@ -26,8 +25,8 @@
 use Rector\Core\Exception\ShouldNotHappenException;
 use Rector\Core\Php\PhpVersionProvider;
 use Rector\Core\PhpParser\Node\BetterNodeFinder;
+use Rector\Core\Reflection\ReflectionResolver;
 use Rector\Core\ValueObject\PhpVersionFeature;
-use Rector\NodeNameResolver\NodeNameResolver;
 use Rector\NodeTypeResolver\NodeTypeResolver;
 use Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType;
 use Rector\TypeDeclaration\TypeAnalyzer\GenericClassStringTypeNormalizer;
@@ -45,9 +44,9 @@ public function __construct(
         private readonly GenericClassStringTypeNormalizer $genericClassStringTypeNormalizer,
         private readonly PhpVersionProvider $phpVersionProvider,
         private readonly BetterNodeFinder $betterNodeFinder,
+        private readonly ReflectionResolver $reflectionResolver,
         private readonly ReflectionProvider $reflectionProvider,
-        private readonly NodeTypeResolver $nodeTypeResolver,
-        private readonly NodeNameResolver $nodeNameResolver
+        private readonly NodeTypeResolver $nodeTypeResolver
     ) {
     }
 
@@ -101,15 +100,15 @@ private function verifyThisType(Type $type, FunctionLike $functionLike): Type
             return $type;
         }
 
-        $class = $this->betterNodeFinder->findParentType($functionLike, Class_::class);
+        $classReflection = $this->reflectionResolver->resolveClassReflection($functionLike);
         $objectType = $type->getStaticObjectType();
         $objectTypeClassName = $objectType->getClassName();
 
-        if (! $class instanceof Class_) {
+        if (! $classReflection instanceof ClassReflection || ! $classReflection->isClass()) {
             return $type;
         }
 
-        if ($this->nodeNameResolver->isName($class, $objectTypeClassName)) {
+        if ($classReflection->getName() === $objectTypeClassName) {
             return $type;
         }
 

src/Kernel/RectorKernel.php

@@ -17,7 +17,7 @@ final class RectorKernel
     /**
      * @var string
      */
-    private const CACHE_KEY = 'v91';
+    private const CACHE_KEY = 'v92';
 
     private ContainerInterface|null $container = null;