Fix ArrayTypeMapper to handle arrays with UnionType items (#8225) (#5568

)
rectorphp · Feb 6, 2024 · 6fe2585 · 6fe2585
1 parent 7976482
commit 6fe2585
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/PHPStanStaticTypeMapper/TypeMapper/ArrayTypeMapper.php b/src/PHPStanStaticTypeMapper/TypeMapper/ArrayTypeMapper.php
@@ -71,15 +71,20 @@ public function mapToPHPStanPhpDocTypeNode(Type $type): TypeNode
         // then e.g. "int" instead of explicit number, and nice arrays
         $itemType = $type->getItemType();
 
-        if ($itemType instanceof UnionType && ! $type instanceof ConstantArrayType) {
+        $isGenericArray = $this->isGenericArrayCandidate($type);
+
+        if ($itemType instanceof UnionType
+            && ! $type instanceof ConstantArrayType
+            && ! $isGenericArray
+        ) {
             return $this->createArrayTypeNodeFromUnionType($itemType);
         }
 
         if ($itemType instanceof ArrayType && $this->isGenericArrayCandidate($itemType)) {
             return $this->createGenericArrayType($type, true);
         }
 
-        if ($this->isGenericArrayCandidate($type)) {
+        if ($isGenericArray) {
             return $this->createGenericArrayType($type, true);
         }
 

diff --git a/tests/PHPStanStaticTypeMapper/TypeMapper/ArrayTypeMapperTest.php b/tests/PHPStanStaticTypeMapper/TypeMapper/ArrayTypeMapperTest.php
@@ -78,5 +78,8 @@ public static function provideDataWithKeys(): Iterator
 
         $arrayType = new ArrayType(new StringType(), new IntegerType());
         yield [$arrayType, 'array<string, int>'];
+
+        $arrayType = new ArrayType(new StringType(), $stringAndIntegerUnionType);
+        yield [$arrayType, 'array<string, string|int>'];
     }
 }