[Renaming] Prevent overly greed type resolving in RenamePropertyRector (

#3700)
rectorphp · Apr 28, 2023 · b3e2696 · b3e2696
1 parent 7d16e3d
commit b3e2696
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/rules/Renaming/Rector/PropertyFetch/RenamePropertyRector.php b/rules/Renaming/Rector/PropertyFetch/RenamePropertyRector.php
@@ -126,13 +126,14 @@ private function processFromPropertyFetch(PropertyFetch $propertyFetch): ?Proper
                 continue;
             }
 
-            if (! $nodeVarType instanceof Type) {
-                $nodeVarType = $this->nodeTypeResolver->getType($propertyFetch->var);
-            }
-
-            if ($nodeVarType instanceof ThisType && $class instanceof ClassLike) {
-                $this->renameProperty($class, $renamedProperty);
-            }
+            if ($class instanceof ClassLike) {
+                if (! $nodeVarType instanceof Type) {
+                    $nodeVarType = $this->nodeTypeResolver->getType($propertyFetch->var);
+                }
+                if ($nodeVarType instanceof ThisType ) {
+                    $this->renameProperty($class, $renamedProperty);
+                }            
+           }
 
             $propertyFetch->name = new Identifier($renamedProperty->getNewProperty());
             return $propertyFetch;