remove accessory array type, to allow array type fill

Author: TomasVotruba

rules-tests/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector/FixtureIntersection/cover_intersection.php

@@ -21,8 +21,6 @@
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\ThisType;
 use PHPStan\Type\Type;
-use PHPStan\Type\TypeCombinator;
-use PHPStan\Type\TypeUtils;
 use PHPStan\Type\UnionType;
 use Rector\NodeTypeResolver\NodeTypeResolver;
 use Rector\NodeTypeResolver\PHPStan\Type\TypeFactory;
@@ -94,15 +92,6 @@ private function resolveStrictArgValueType(Arg $arg): Type
     {
         $argValueType = $this->nodeTypeResolver->getNativeType($arg->value);
 
-        if ($argValueType instanceof IntersectionType) {
-            dump($argValueType);
-
-            $argValueType = TypeCombinator::remove($argValueType, new AccessoryArrayListType());
-
-            dump($argValueType);
-            die;
-        }
-
         return $this->normalizeType($argValueType);
     }
 
@@ -245,4 +234,26 @@ private function isArrayMixedMixedType(Type $type): bool
 
         return $type->getKeyType() instanceof MixedType || $type->getKeyType() instanceof NeverType;
     }
+
+    private function cleanArrayIntersectionType(Type $type): Type
+    {
+        if (! $type instanceof IntersectionType) {
+            return $type;
+        }
+
+        $cleanTypes = [];
+        foreach ($type->getTypes() as $intersectionType) {
+            if ($intersectionType instanceof AccessoryArrayListType) {
+                continue;
+            }
+
+            $cleanTypes[] = $intersectionType;
+        }
+
+        if (count($cleanTypes) === 1) {
+            return $cleanTypes[0];
+        }
+
+        return new IntersectionType($cleanTypes);
+    }
 }

rules-tests/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector/FixtureIntersection/cover_intersection_with_docblock.php.inc

@@ -29,11 +29,13 @@
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\Native\NativeFunctionReflection;
 use PHPStan\Reflection\ReflectionProvider;
+use PHPStan\Type\Accessory\AccessoryArrayListType;
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\Constant\ConstantArrayType;
 use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\ErrorType;
+use PHPStan\Type\IntersectionType;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\NeverType;
 use PHPStan\Type\NullType;
@@ -279,6 +281,10 @@ public function getNativeType(Expr $expr): Type
             $type = $this->resolveArrayDimFetchType($expr, $scope, $type);
         }
 
+        if ($type instanceof IntersectionType) {
+            $type = $this->cleanArrayIntersectionType($type);
+        }
+
         if (! $type instanceof UnionType) {
             if ($this->isAnonymousObjectType($type)) {
                 return new ObjectWithoutClassType();
@@ -675,4 +681,26 @@ private function isSubstrOnPHP74(FuncCall $funcCall): bool
 
         return ! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersion::PHP_80);
     }
+
+    private function cleanArrayIntersectionType(Type $type): Type
+    {
+        if (! $type instanceof IntersectionType) {
+            return $type;
+        }
+
+        $cleanTypes = [];
+        foreach ($type->getTypes() as $intersectionType) {
+            if ($intersectionType instanceof AccessoryArrayListType) {
+                continue;
+            }
+
+            $cleanTypes[] = $intersectionType;
+        }
+
+        if (count($cleanTypes) === 1) {
+            return $cleanTypes[0];
+        }
+
+        return new IntersectionType($cleanTypes);
+    }
 }