[DeadCode] Clean up TypeHasher on Union Type (#5792)

* [DeadCode] Clean up TypeHasher on Union Type * fix phpstan
rectorphp · Apr 3, 2024 · 52aa64f · 52aa64f
1 parent ef333de
commit 52aa64f
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 34 deletions.
diff --git a/...ty/Rector/Class_/CompleteDynamicPropertiesRector/FixtureUnionTypes/multiple_types.php.inc b/...ty/Rector/Class_/CompleteDynamicPropertiesRector/FixtureUnionTypes/multiple_types.php.inc
@@ -23,7 +23,7 @@ namespace Rector\Tests\CodeQuality\Rector\Class_\CompleteDynamicPropertiesRector
 class MultipleTypes
 {
     /**
-     * @var int|string|bool
+     * @var bool|int|string
      */
     public $value;
     public function set()

diff --git a/...ts/DeadCode/Rector/ClassMethod/RemoveUselessParamTagRector/Fixture/union_unsorted.php.inc b/...ts/DeadCode/Rector/ClassMethod/RemoveUselessParamTagRector/Fixture/union_unsorted.php.inc
@@ -0,0 +1,30 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveUselessParamTagRector\Fixture;
+
+class UnionUnsorted
+{
+    /**
+     * @param bool|int|string $param
+     */
+    function foo(string|int|bool $param)
+    {
+
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveUselessParamTagRector\Fixture;
+
+class UnionUnsorted
+{
+    function foo(string|int|bool $param)
+    {
+
+    }
+}
+
+?>
diff --git a/rules/DeadCode/PhpDoc/DeadParamTagValueNodeAnalyzer.php b/rules/DeadCode/PhpDoc/DeadParamTagValueNodeAnalyzer.php
@@ -4,8 +4,10 @@
 
 namespace Rector\DeadCode\PhpDoc;
 
+use PHPStan\PhpDocParser\Ast\Type\UnionTypeNode;
 use PhpParser\Node\FunctionLike;
 use PhpParser\Node\Name;
+use PhpParser\Node\Name\FullyQualified;
 use PhpParser\Node\Param;
 use PHPStan\PhpDocParser\Ast\PhpDoc\ParamTagValueNode;
 use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
@@ -44,6 +46,10 @@ public function isDead(ParamTagValueNode $paramTagValueNode, FunctionLike $funct
             return false;
         }
 
+        if ($paramTagValueNode->type instanceof UnionTypeNode && $param->type instanceof FullyQualified) {
+            return false;
+        }
+
         if ($param->type instanceof Name && $this->nodeNameResolver->isName($param->type, 'object')) {
             return $paramTagValueNode->type instanceof IdentifierTypeNode && (string) $paramTagValueNode->type === 'object';
         }
@@ -64,10 +70,15 @@ public function isDead(ParamTagValueNode $paramTagValueNode, FunctionLike $funct
             return true;
         }
 
-        if ($this->mixedArrayTypeNodeAnalyzer->hasMixedArrayType($paramTagValueNode->type)) {
+        return $this->isAllowedBracketAwareUnion($paramTagValueNode->type);
+    }
+
+    private function isAllowedBracketAwareUnion(BracketsAwareUnionTypeNode $bracketsAwareUnionTypeNode): bool
+    {
+        if ($this->mixedArrayTypeNodeAnalyzer->hasMixedArrayType($bracketsAwareUnionTypeNode)) {
             return false;
         }
 
-        return ! $this->genericTypeNodeAnalyzer->hasGenericType($paramTagValueNode->type);
+        return ! $this->genericTypeNodeAnalyzer->hasGenericType($bracketsAwareUnionTypeNode);
     }
 }
diff --git a/rules/DeadCode/PhpDoc/TagRemover/ParamTagRemover.php b/rules/DeadCode/PhpDoc/TagRemover/ParamTagRemover.php
@@ -8,7 +8,6 @@
 use PHPStan\PhpDocParser\Ast\Node;
 use PHPStan\PhpDocParser\Ast\PhpDoc\ParamTagValueNode;
 use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
-use PHPStan\PhpDocParser\Ast\Type\UnionTypeNode;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
 use Rector\Comments\NodeDocBlock\DocBlockUpdater;
 use Rector\DeadCode\PhpDoc\DeadParamTagValueNodeAnalyzer;

diff --git a/src/NodeTypeResolver/PHPStan/TypeHasher.php b/src/NodeTypeResolver/PHPStan/TypeHasher.php
@@ -5,7 +5,6 @@
 namespace Rector\NodeTypeResolver\PHPStan;
 
 use PHPStan\Type\ArrayType;
-use PHPStan\Type\BooleanType;
 use PHPStan\Type\ConstantType;
 use PHPStan\Type\Generic\GenericObjectType;
 use PHPStan\Type\IterableType;
@@ -14,7 +13,6 @@
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeTraverser;
 use PHPStan\Type\TypeWithClassName;
-use PHPStan\Type\UnionType;
 use PHPStan\Type\VerbosityLevel;
 use Rector\StaticTypeMapper\ValueObject\Type\AliasedObjectType;
 use Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType;
@@ -49,10 +47,6 @@ public function createTypeHash(Type $type): string
             return $type::class;
         }
 
-        if ($type instanceof UnionType) {
-            return $this->createUnionTypeHash($type);
-        }
-
         $type = $this->normalizeObjectType($type);
 
         // normalize iterable
@@ -84,30 +78,6 @@ private function resolveUniqueTypeWithClassNameHash(TypeWithClassName $typeWithC
         return $typeWithClassName->getClassName();
     }
 
-    private function createUnionTypeHash(UnionType $unionType): string
-    {
-        $booleanType = new BooleanType();
-        if ($booleanType->isSuperTypeOf($unionType)->yes()) {
-            return $booleanType->describe(VerbosityLevel::precise());
-        }
-
-        $normalizedUnionType = clone $unionType;
-
-        // change alias to non-alias
-        TypeTraverser::map(
-            $normalizedUnionType,
-            static function (Type $type, callable $callable): Type {
-                if (! $type instanceof AliasedObjectType && ! $type instanceof ShortenedObjectType) {
-                    return $callable($type);
-                }
-
-                return new FullyQualifiedObjectType($type->getFullyQualifiedName());
-            }
-        );
-
-        return $normalizedUnionType->describe(VerbosityLevel::precise());
-    }
-
     private function normalizeObjectType(Type $type): Type
     {
         return TypeTraverser::map($type, static function (Type $currentType, callable $traverseCallback): Type {