[Transform] Make ParentClassToTraitsRector match only exact parent, n…

…o its child (#1774)
rectorphp · Feb 7, 2022 · 63425ba · 63425ba
1 parent 2869f42
commit 63425ba
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 6 deletions.
diff --git a/...tests/Transform/Rector/Class_/ParentClassToTraitsRector/Fixture/skip_middle_class.php.inc b/...tests/Transform/Rector/Class_/ParentClassToTraitsRector/Fixture/skip_middle_class.php.inc
@@ -0,0 +1,9 @@
+<?php
+
+namespace Rector\Tests\Transform\Rector\Class_\ParentClassToTraitsRector\Fixture;
+
+use Rector\Tests\Transform\Rector\Class_\ParentClassToTraitsRector\Source\ClassInTheMiddle;
+
+final class SkipMiddleClass extends ClassInTheMiddle
+{
+}
diff --git a/rules-tests/Transform/Rector/Class_/ParentClassToTraitsRector/Source/ClassInTheMiddle.php b/rules-tests/Transform/Rector/Class_/ParentClassToTraitsRector/Source/ClassInTheMiddle.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\Transform\Rector\Class_\ParentClassToTraitsRector\Source;
+
+class ClassInTheMiddle extends ParentObject
+{
+}
diff --git a/rules/Transform/Rector/Class_/ParentClassToTraitsRector.php b/rules/Transform/Rector/Class_/ParentClassToTraitsRector.php
@@ -5,6 +5,7 @@
 namespace Rector\Transform\Rector\Class_;
 
 use PhpParser\Node;
+use PhpParser\Node\Name;
 use PhpParser\Node\Stmt\Class_;
 use Rector\Core\Contract\Rector\ConfigurableRectorInterface;
 use Rector\Core\NodeAnalyzer\ClassAnalyzer;
@@ -76,7 +77,8 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Node
     {
-        if ($node->extends === null) {
+        $parentExtends = $node->extends;
+        if (! $parentExtends instanceof Name) {
             return null;
         }
 
@@ -85,7 +87,7 @@ public function refactor(Node $node): ?Node
         }
 
         foreach ($this->parentClassToTraits as $parentClassToTrait) {
-            if (! $this->isObjectType($node, $parentClassToTrait->getParentObjectType())) {
+            if (! $this->isName($parentExtends, $parentClassToTrait->getParentType())) {
                 continue;
             }
 

diff --git a/rules/Transform/ValueObject/ParentClassToTraits.php b/rules/Transform/ValueObject/ParentClassToTraits.php
@@ -4,8 +4,6 @@
 
 namespace Rector\Transform\ValueObject;
 
-use PHPStan\Type\ObjectType;
-
 final class ParentClassToTraits
 {
     /**
@@ -17,9 +15,9 @@ public function __construct(
     ) {
     }
 
-    public function getParentObjectType(): ObjectType
+    public function getParentType(): string
     {
-        return new ObjectType($this->parentType);
+        return $this->parentType;
     }
 
     /**