[DeadCode] Remove union with interface on RemoveUselessParamTagRector…

… to make it consistent (#5794) * [DeadCode] Remove union with interface on RemoveUselessParamTagRector * [ci-review] Rector Rectify --------- Co-authored-by: GitHub Action <actions@github.com>
rectorphp · Apr 3, 2024 · f889e41 · f889e41
1 parent 8bce424
commit f889e41
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 29 deletions.
diff --git a/...ssMethod/RemoveUselessParamTagRector/Fixture/skip_union_of_interface_with_comment.php.inc b/...ssMethod/RemoveUselessParamTagRector/Fixture/skip_union_of_interface_with_comment.php.inc
diff --git a/...r/Fixture/skip_union_of_interface.php.inc → ...Rector/Fixture/union_of_interface.php.inc b/...r/Fixture/skip_union_of_interface.php.inc → ...Rector/Fixture/union_of_interface.php.inc
@@ -7,7 +7,7 @@ namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveUselessParamTagRector\F
 use Rector\Tests\DeadCode\Rector\ClassMethod\RemoveUselessParamTagRector\Source\SomeInterface;
 use Rector\Tests\DeadCode\Rector\ClassMethod\RemoveUselessParamTagRector\Source\SomeClass;
 
-class SkipUnionOfInterface {
+class UnionOfInterface {
     /**
      * @param SomeClass|SomeInterface $someInterface
      */
@@ -18,3 +18,25 @@ class SkipUnionOfInterface {
         }
 	}
 }
+
+?>
+-----
+<?php
+
+declare(strict_types = 1);
+
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveUselessParamTagRector\Fixture;
+
+use Rector\Tests\DeadCode\Rector\ClassMethod\RemoveUselessParamTagRector\Source\SomeInterface;
+use Rector\Tests\DeadCode\Rector\ClassMethod\RemoveUselessParamTagRector\Source\SomeClass;
+
+class UnionOfInterface {
+    public function run(SomeInterface $someInterface)
+    {
+        if (method_exists($someInterface, 'run')) {
+            $someInterface->run();
+        }
+	}
+}
+
+?>
diff --git a/...r/ClassMethod/RemoveUselessParamTagRector/Fixture/union_of_interface_with_comment.php.inc b/...r/ClassMethod/RemoveUselessParamTagRector/Fixture/union_of_interface_with_comment.php.inc
@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveUselessParamTagRector\Fixture;
+
+use Rector\Tests\DeadCode\Rector\ClassMethod\RemoveUselessParamTagRector\Source\SomeInterface;
+use Rector\Tests\DeadCode\Rector\ClassMethod\RemoveUselessParamTagRector\Source\SomeClass;
+
+class UnionOfInterface {
+    /**
+     * Some comment
+     *
+     * @param SomeClass|SomeInterface $someInterface
+     */
+    public function run(SomeInterface $someInterface)
+    {
+        if (method_exists($someInterface, 'run')) {
+            $someInterface->run();
+        }
+	}
+}
+
+?>
+-----
+<?php
+
+declare(strict_types = 1);
+
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveUselessParamTagRector\Fixture;
+
+use Rector\Tests\DeadCode\Rector\ClassMethod\RemoveUselessParamTagRector\Source\SomeInterface;
+use Rector\Tests\DeadCode\Rector\ClassMethod\RemoveUselessParamTagRector\Source\SomeClass;
+
+class UnionOfInterface {
+    /**
+     * Some comment
+     */
+    public function run(SomeInterface $someInterface)
+    {
+        if (method_exists($someInterface, 'run')) {
+            $someInterface->run();
+        }
+	}
+}
+
+?>
diff --git a/src/NodeTypeResolver/TypeComparator/TypeComparator.php b/src/NodeTypeResolver/TypeComparator/TypeComparator.php
@@ -4,9 +4,7 @@
 
 namespace Rector\NodeTypeResolver\TypeComparator;
 
-use PHPStan\PhpDocParser\Ast\Type\UnionTypeNode;
 use PhpParser\Node;
-use PhpParser\Node\Name\FullyQualified;
 use PHPStan\PhpDocParser\Ast\PhpDoc\ParamTagValueNode;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
 use PHPStan\Reflection\ClassReflection;
@@ -83,10 +81,6 @@ public function arePhpParserAndPhpStanPhpDocTypesEqual(
         TypeNode $phpStanDocTypeNode,
         Node $node
     ): bool {
-        if ($phpStanDocTypeNode instanceof UnionTypeNode && $phpParserNode instanceof FullyQualified) {
-            return false;
-        }
-
         $phpParserNodeType = $this->staticTypeMapper->mapPhpParserNodePHPStanType($phpParserNode);
         $phpStanDocType = $this->staticTypeMapper->mapPHPStanPhpDocTypeNodeToPHPStanType(
             $phpStanDocTypeNode,