[TypeDeclaration] Remove parent lookup on TrustedClassMethodPropertyT…

…ypeInferer (#4207) * [TypeDeclaration] Remove parent lookup on TrustedClassMethodPropertyTypeInferer * clean up * Fix * Fix * Fix * increase rector kernel
rectorphp · Jun 12, 2023 · 0adda9c · 0adda9c
1 parent 0a36378
commit 0adda9c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 17 deletions.
diff --git a/rules/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorRector.php b/rules/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorRector.php
@@ -97,6 +97,7 @@ public function refactor(Node $node): ?Node
             }
 
             $propertyType = $this->trustedClassMethodPropertyTypeInferer->inferProperty(
+                $node,
                 $property,
                 $constructClassMethod
             );

diff --git a/rules/TypeDeclaration/Rector/Property/TypedPropertyFromStrictSetUpRector.php b/rules/TypeDeclaration/Rector/Property/TypedPropertyFromStrictSetUpRector.php
@@ -93,7 +93,7 @@ public function refactor(Node $node): ?Node
                 continue;
             }
 
-            $propertyType = $this->trustedClassMethodPropertyTypeInferer->inferProperty($property, $setUpClassMethod);
+            $propertyType = $this->trustedClassMethodPropertyTypeInferer->inferProperty($node, $property, $setUpClassMethod);
 
             $propertyTypeNode = $this->staticTypeMapper->mapPHPStanTypeToPhpParserNode(
                 $propertyType,

diff --git a/...TypeDeclaration/TypeInferer/PropertyTypeInferer/TrustedClassMethodPropertyTypeInferer.php b/...TypeDeclaration/TypeInferer/PropertyTypeInferer/TrustedClassMethodPropertyTypeInferer.php
@@ -11,7 +11,7 @@
 use PhpParser\Node\Name\FullyQualified;
 use PhpParser\Node\NullableType;
 use PhpParser\Node\Param;
-use PhpParser\Node\Stmt\ClassLike;
+use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Property;
 use PhpParser\NodeTraverser;
@@ -24,7 +24,6 @@
 use PHPStan\Type\UnionType;
 use Rector\Core\NodeAnalyzer\ParamAnalyzer;
 use Rector\Core\NodeManipulator\ClassMethodPropertyFetchManipulator;
-use Rector\Core\PhpParser\Node\BetterNodeFinder;
 use Rector\NodeNameResolver\NodeNameResolver;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\NodeTypeResolver\NodeTypeResolver;
@@ -49,26 +48,20 @@ public function __construct(
         private readonly TypeFactory $typeFactory,
         private readonly StaticTypeMapper $staticTypeMapper,
         private readonly NodeTypeResolver $nodeTypeResolver,
-        private readonly BetterNodeFinder $betterNodeFinder,
         private readonly ParamAnalyzer $paramAnalyzer,
         private readonly AssignToPropertyTypeInferer $assignToPropertyTypeInferer,
         private readonly TypeComparator $typeComparator,
     ) {
     }
 
-    public function inferProperty(Property $property, ClassMethod $classMethod): Type
+    public function inferProperty(Class_ $class, Property $property, ClassMethod $classMethod): Type
     {
-        $classLike = $this->betterNodeFinder->findParentType($property, ClassLike::class);
-        if (! $classLike instanceof ClassLike) {
-            return new MixedType();
-        }
-
         $propertyName = $this->nodeNameResolver->getName($property);
 
         // 1. direct property = param assign
         $param = $this->classMethodPropertyFetchManipulator->findParamAssignToPropertyName($classMethod, $propertyName);
         if ($param instanceof Param) {
-            return $this->resolveTypeFromParam($param, $classMethod, $propertyName, $property, $classLike);
+            return $this->resolveTypeFromParam($param, $classMethod, $propertyName, $property, $class);
         }
 
         // 2. different assign
@@ -91,19 +84,19 @@ public function inferProperty(Property $property, ClassMethod $classMethod): Typ
             ? $resolvedTypes[0]
             : TypeCombinator::union(...$resolvedTypes);
 
-        return $this->resolveType($property, $propertyName, $classLike, $resolvedType);
+        return $this->resolveType($property, $propertyName, $class, $resolvedType);
     }
 
     private function resolveType(
         Property $property,
         string $propertyName,
-        ClassLike $classLike,
+        Class_ $class,
         Type $resolvedType
     ): Type {
         $exactType = $this->assignToPropertyTypeInferer->inferPropertyInClassLike(
             $property,
             $propertyName,
-            $classLike
+            $class
         );
 
         if (! $exactType instanceof UnionType) {
@@ -244,13 +237,13 @@ private function resolveTypeFromParam(
         ClassMethod $classMethod,
         string $propertyName,
         Property $property,
-        ClassLike $classLike
+        Class_ $class
     ): Type {
         if ($param->type === null) {
             return new MixedType();
         }
 
         $resolvedType = $this->resolveFromParamType($param, $classMethod, $propertyName);
-        return $this->resolveType($property, $propertyName, $classLike, $resolvedType);
+        return $this->resolveType($property, $propertyName, $class, $resolvedType);
     }
 }
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 = 'v116';
+    private const CACHE_KEY = 'v118';
 
     private ContainerInterface|null $container = null;