[Naming] Remove parent lookup on PropertyRenameFactory (#4232)

rectorphp · Jun 14, 2023 · 7753562 · 7753562
1 parent dfa6e77
commit 7753562
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/rules/Naming/Rector/Class_/RenamePropertyToMatchTypeRector.php b/rules/Naming/Rector/Class_/RenamePropertyToMatchTypeRector.php
@@ -108,7 +108,7 @@ private function refactorClassProperties(ClassLike $classLike): void
                 continue;
             }
 
-            $propertyRename = $this->propertyRenameFactory->createFromExpectedName($property, $expectedPropertyName);
+            $propertyRename = $this->propertyRenameFactory->createFromExpectedName($classLike, $property, $expectedPropertyName);
 
             if (! $propertyRename instanceof PropertyRename) {
                 continue;

diff --git a/rules/Naming/ValueObjectFactory/PropertyRenameFactory.php b/rules/Naming/ValueObjectFactory/PropertyRenameFactory.php
@@ -6,27 +6,19 @@
 
 use PhpParser\Node\Stmt\ClassLike;
 use PhpParser\Node\Stmt\Property;
-use Rector\Core\PhpParser\Node\BetterNodeFinder;
 use Rector\Naming\ValueObject\PropertyRename;
 use Rector\NodeNameResolver\NodeNameResolver;
 
 final class PropertyRenameFactory
 {
     public function __construct(
         private readonly NodeNameResolver $nodeNameResolver,
-        private readonly BetterNodeFinder $betterNodeFinder,
     ) {
     }
 
-    public function createFromExpectedName(Property $property, string $expectedName): ?PropertyRename
+    public function createFromExpectedName(ClassLike $classLike, Property $property, string $expectedName): ?PropertyRename
     {
         $currentName = $this->nodeNameResolver->getName($property);
-
-        $classLike = $this->betterNodeFinder->findParentType($property, ClassLike::class);
-        if (! $classLike instanceof ClassLike) {
-            return null;
-        }
-
         $className = (string) $this->nodeNameResolver->getName($classLike);
 
         return new PropertyRename(