[Php80] Do not remove array<mixed> inside Union type on UnionTypesRec…

…tor (#2358) * [Php80] Do not remove array<mixed> inside Union type on UnionTypesRector * Fixed 🎉 * also allow mixed[] * clean up * clean up
rectorphp · May 25, 2022 · 4c53b20 · 4c53b20
1 parent e1ecbe9
commit 4c53b20
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 8 deletions.
diff --git a/...r/Fixture/_remove_doc_array_typed.php.inc → ..._not_remove_doc_array_typed_mixed.php.inc b/...r/Fixture/_remove_doc_array_typed.php.inc → ..._not_remove_doc_array_typed_mixed.php.inc
@@ -2,7 +2,7 @@
 
 namespace Rector\Tests\Php80\Rector\FunctionLike\UnionTypesRector\Fixture;
 
-final class RemoveDocArrayTyped
+final class DoNotRemoveDocArrayTypedMixed
 {
     /**
      * @return bool|float|int|string|array<mixed>
@@ -19,8 +19,11 @@ final class RemoveDocArrayTyped
 
 namespace Rector\Tests\Php80\Rector\FunctionLike\UnionTypesRector\Fixture;
 
-final class RemoveDocArrayTyped
+final class DoNotRemoveDocArrayTypedMixed
 {
+    /**
+     * @return bool|float|int|string|array<mixed>
+     */
     public function normalizeNodeValue($value): bool|float|int|string|array
     {
         return $value;

diff --git a/.../Fixture/_remove_doc_array_typed2.php.inc → ...not_remove_doc_array_typed_mixed2.php.inc b/.../Fixture/_remove_doc_array_typed2.php.inc → ...not_remove_doc_array_typed_mixed2.php.inc
@@ -2,7 +2,7 @@
 
 namespace Rector\Tests\Php80\Rector\FunctionLike\UnionTypesRector\Fixture;
 
-final class RemoveDocArrayTyped2
+final class DoNotRemoveDocArrayTypedMixed2
 {
     /**
      * @param bool|float|int|string|array<mixed> $value
@@ -19,8 +19,11 @@ final class RemoveDocArrayTyped2
 
 namespace Rector\Tests\Php80\Rector\FunctionLike\UnionTypesRector\Fixture;
 
-final class RemoveDocArrayTyped2
+final class DoNotRemoveDocArrayTypedMixed2
 {
+    /**
+     * @param bool|float|int|string|array<mixed> $value
+     */
     public function normalizeNodeValue(bool|float|int|string|array $value)
     {
         return $value;

diff --git a/...Rector/FunctionLike/UnionTypesRector/Fixture/do_not_remove_doc_array_typed_mixed3.php.inc b/...Rector/FunctionLike/UnionTypesRector/Fixture/do_not_remove_doc_array_typed_mixed3.php.inc
@@ -0,0 +1,33 @@
+<?php
+
+namespace Rector\Tests\Php80\Rector\FunctionLike\UnionTypesRector\Fixture;
+
+final class DoNotRemoveDocArrayTypedMixed3
+{
+    /**
+     * @param bool|float|int|string|mixed[] $value
+     */
+    public function normalizeNodeValue($value)
+    {
+        return $value;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Php80\Rector\FunctionLike\UnionTypesRector\Fixture;
+
+final class DoNotRemoveDocArrayTypedMixed3
+{
+    /**
+     * @param bool|float|int|string|mixed[] $value
+     */
+    public function normalizeNodeValue(bool|float|int|string|array $value)
+    {
+        return $value;
+    }
+}
+
+?>
diff --git a/rules-tests/Php80/Rector/FunctionLike/UnionTypesRector/Fixture/skip_with_array_mixed.php.inc b/rules-tests/Php80/Rector/FunctionLike/UnionTypesRector/Fixture/skip_with_array_mixed.php.inc
@@ -0,0 +1,15 @@
+<?php
+
+namespace Rector\Tests\Php80\Rector\FunctionLike\UnionTypesRector\Fixture;
+
+final class SkipWithArrayMixed
+{
+    /**
+     * @param object|array<mixed> $foo
+     * @param array<mixed> $bar
+     */
+    public function run(object|array $foo, array $bar): int
+    {
+        return 5;
+    }
+}
diff --git a/rules/DeadCode/PhpDoc/DeadParamTagValueNodeAnalyzer.php b/rules/DeadCode/PhpDoc/DeadParamTagValueNodeAnalyzer.php
@@ -20,6 +20,7 @@
 use Rector\BetterPhpDocParser\ValueObject\PhpDocAttributeKey;
 use Rector\BetterPhpDocParser\ValueObject\Type\BracketsAwareUnionTypeNode;
 use Rector\DeadCode\TypeNodeAnalyzer\GenericTypeNodeAnalyzer;
+use Rector\DeadCode\TypeNodeAnalyzer\MixedArrayTypeNodeAnalyzer;
 use Rector\NodeNameResolver\NodeNameResolver;
 use Rector\NodeTypeResolver\TypeComparator\TypeComparator;
 
@@ -29,6 +30,7 @@ public function __construct(
         private readonly NodeNameResolver $nodeNameResolver,
         private readonly TypeComparator $typeComparator,
         private readonly GenericTypeNodeAnalyzer $genericTypeNodeAnalyzer,
+        private readonly MixedArrayTypeNodeAnalyzer $mixedArrayTypeNodeAnalyzer
     ) {
     }
 
@@ -63,6 +65,10 @@ public function isDead(ParamTagValueNode $paramTagValueNode, FunctionLike $funct
             return $this->isEmptyDescription($paramTagValueNode, $param->type);
         }
 
+        if ($this->mixedArrayTypeNodeAnalyzer->hasMixedArrayType($paramTagValueNode->type)) {
+            return false;
+        }
+
         if (! $this->genericTypeNodeAnalyzer->hasGenericType($paramTagValueNode->type)) {
             return $this->isEmptyDescription($paramTagValueNode, $param->type);
         }

diff --git a/rules/DeadCode/TypeNodeAnalyzer/GenericTypeNodeAnalyzer.php b/rules/DeadCode/TypeNodeAnalyzer/GenericTypeNodeAnalyzer.php
@@ -15,10 +15,6 @@ public function hasGenericType(UnionTypeNode $unionTypeNode): bool
 
         foreach ($types as $type) {
             if ($type instanceof GenericTypeNode) {
-                if ($type->type->name === 'array') {
-                    continue;
-                }
-
                 return true;
             }
         }