[TypeDeclaration] Add mixed[] array back on complex class-string stru…

…cture on CompleteVarDocTypePropertyRector (#1116)
rectorphp · Oct 30, 2021 · 4ddd986 · 4ddd986
1 parent e525dad
commit 4ddd986
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/...ty/CompleteVarDocTypePropertyRector/Fixture/recursive_multiple_class_string_array.php.inc b/...ty/CompleteVarDocTypePropertyRector/Fixture/recursive_multiple_class_string_array.php.inc
@@ -41,7 +41,7 @@ class FactoryC {}
 final class RecursiveMultipleClassStringArray
 {
     /**
-     * @var array<string, array<class-string<\Rector\Tests\TypeDeclaration\Rector\Property\CompleteVarDocTypePropertyRector\Fixture\FactoryA>|class-string<\Rector\Tests\TypeDeclaration\Rector\Property\CompleteVarDocTypePropertyRector\Fixture\FactoryB>|class-string<\Rector\Tests\TypeDeclaration\Rector\Property\CompleteVarDocTypePropertyRector\Fixture\FactoryC>|class-string<\Rector\Tests\TypeDeclaration\Rector\Property\CompleteVarDocTypePropertyRector\Fixture\InvokableA>|class-string<\Rector\Tests\TypeDeclaration\Rector\Property\CompleteVarDocTypePropertyRector\Fixture\InvokableB>|class-string<\Rector\Tests\TypeDeclaration\Rector\Property\CompleteVarDocTypePropertyRector\Fixture\InvokableC>>>
+     * @var array<string, mixed[]>
      */
     public $services = [
         'invokables' => [

diff --git a/rules/TypeDeclaration/TypeAnalyzer/GenericClassStringTypeNormalizer.php b/rules/TypeDeclaration/TypeAnalyzer/GenericClassStringTypeNormalizer.php
@@ -7,7 +7,6 @@
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\ClassStringType;
-use PHPStan\Type\Constant\ConstantArrayType;
 use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\Generic\GenericClassStringType;
@@ -108,7 +107,7 @@ private function resolveClassStringInUnionType(UnionType $type): UnionType | Arr
             $keyType = $unionType->getKeyType();
             $itemType = $unionType->getItemType();
 
-            if ($itemType instanceof ConstantArrayType) {
+            if ($itemType instanceof ArrayType) {
                 $arrayType = new ArrayType(new MixedType(), new MixedType());
                 return new ArrayType($keyType, $arrayType);
             }