avoid using array in nested doc type, used array<mixed>

Author: TomasVotruba

rules-tests/TypeDeclarationDocblocks/Rector/Class_/AddReturnDocblockDataProviderRector/Fixture/nested_array_is_mixed.php.inc

@@ -0,0 +1,48 @@
+<?php
+
+namespace Rector\Tests\TypeDeclarationDocblocks\Rector\Class_\AddReturnDocblockDataProviderRector\Fixture;
+
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\TestCase;
+
+final class NestedArrayIsMixed extends TestCase
+{
+    #[DataProvider('provideData')]
+    public function testSomething()
+    {
+    }
+
+    public static function provideData(): \Generator
+    {
+        yield [[]];
+        yield [[1, 2, 3, 4]];
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\TypeDeclarationDocblocks\Rector\Class_\AddReturnDocblockDataProviderRector\Fixture;
+
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\TestCase;
+
+final class NestedArrayIsMixed extends TestCase
+{
+    #[DataProvider('provideData')]
+    public function testSomething()
+    {
+    }
+
+    /**
+     * @return \Generator<array<int, array<mixed>>>
+     */
+    public static function provideData(): \Generator
+    {
+        yield [[]];
+        yield [[1, 2, 3, 4]];
+    }
+}
+
+?>

rules/TypeDeclarationDocblocks/NodeDocblockTypeDecorator.php

@@ -62,13 +62,13 @@ public function decorateGenericIterableReturnType(
         PhpDocInfo $classMethodPhpDocInfo,
         ClassMethod $classMethod
     ): bool {
-        $typeNode = $this->createTypeNode($type);
-
         if ($this->isBareMixedType($type)) {
             // no value
             return false;
         }
 
+        $typeNode = $this->createTypeNode($type);
+
         // no value iterable type
         if ($typeNode instanceof IdentifierTypeNode) {
             return false;

rules/TypeDeclarationDocblocks/Rector/Class_/AddReturnDocblockDataProviderRector.php

@@ -9,6 +9,7 @@
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\Return_;
 use PHPStan\PhpDocParser\Ast\PhpDoc\ReturnTagValueNode;
+use PHPStan\Type\Type;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\PHPUnit\NodeAnalyzer\TestsNodeAnalyzer;
 use Rector\Rector\AbstractRector;
@@ -108,7 +109,6 @@ public function refactor(Node $node): ?Node
         $hasChanged = false;
 
         $dataProviderClassMethods = $this->dataProviderMethodsFinder->findDataProviderNodesInClass($node);
-
         if ($dataProviderClassMethods === []) {
             return null;
         }

src/PHPStanStaticTypeMapper/TypeMapper/ArrayTypeMapper.php

@@ -75,6 +75,7 @@ public function mapToPHPStanPhpDocTypeNode(Type $type): TypeNode
         }
 
         if ($itemType instanceof ArrayType && $this->isGenericArrayCandidate($itemType)) {
+
             return $this->createGenericArrayType($type, true);
         }
 
@@ -182,6 +183,7 @@ private function createGenericArrayType(ArrayType $arrayType, bool $withKey = fa
         }
 
         $identifierTypeNode->setAttribute(self::HAS_GENERIC_TYPE_PARENT, $withKey);
+
         return new GenericTypeNode($identifierTypeNode, $genericTypes);
     }
 

src/PHPStanStaticTypeMapper/TypeMapper/ObjectTypeMapper.php

@@ -9,7 +9,9 @@
 use PhpParser\Node\Name;
 use PhpParser\Node\Name\FullyQualified;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
+use PHPStan\Type\ArrayType;
 use PHPStan\Type\Generic\GenericObjectType;
+use PHPStan\Type\MixedType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeTraverser;
@@ -36,6 +38,12 @@ public function getNodeClass(): string
     public function mapToPHPStanPhpDocTypeNode(Type $type): TypeNode
     {
         $type = TypeTraverser::map($type, static function (Type $type, callable $traverse): Type {
+            if ($type instanceof ArrayType) {
+                if ($type->getItemType() instanceof MixedType && $type->getKeyType() instanceof MixedType) {
+                    return new ArrayType(new MixedType(), new MixedType(true));
+                }
+            }
+
             if (! $type instanceof ObjectType) {
                 return $traverse($type);
             }
@@ -52,10 +60,10 @@ public function mapToPHPStanPhpDocTypeNode(Type $type): TypeNode
             }
 
             if ($type instanceof GenericObjectType) {
-                return $traverse(new GenericObjectType('\\' . $type->getClassName(), $type->getTypes()));
+                return $traverse(new GenericObjectType('\\' . $type->getClassName(), $type->getTypes()), $traverse);
             }
 
-            return $traverse($type);
+            return $traverse($type, $traverse);
         });
 
         return $type->toPhpDocNode();