in ConstantArrayTypeBuilder

Author: staabm

src/Type/Constant/ConstantArrayType.php

@@ -29,8 +29,6 @@
 use PHPStan\Type\Accessory\NonEmptyArrayType;
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\BooleanType;
-use PHPStan\Type\CallableType;
-use PHPStan\Type\ClosureType;
 use PHPStan\Type\CompoundType;
 use PHPStan\Type\ConstantScalarType;
 use PHPStan\Type\ErrorType;
@@ -169,26 +167,7 @@ public function getIterableValueType(): Type
 			return $this->iterableValueType;
 		}
 
-		$count = count($this->valueTypes);
-		if ($count === 0) {
-			return $this->iterableValueType = new NeverType(true);
-		}
-
-		if ($count > 16) {
-			$onlyClosureValues = true;
-			foreach ($this->valueTypes as $valueType) {
-				if (!$valueType instanceof ClosureType) {
-					$onlyClosureValues = false;
-					break;
-				}
-			}
-
-			if ($onlyClosureValues) {
-				return $this->iterableValueType = new CallableType();
-			}
-		}
-
-		return $this->iterableValueType = TypeCombinator::union(...$this->valueTypes);
+		return $this->iterableValueType = count($this->valueTypes) > 0 ? TypeCombinator::union(...$this->valueTypes) : new NeverType(true);
 	}
 
 	public function getKeyType(): Type

src/Type/Constant/ConstantArrayTypeBuilder.php

@@ -8,6 +8,8 @@
 use PHPStan\Type\Accessory\NonEmptyArrayType;
 use PHPStan\Type\Accessory\OversizedArrayType;
 use PHPStan\Type\ArrayType;
+use PHPStan\Type\CallableType;
+use PHPStan\Type\ClosureType;
 use PHPStan\Type\IntersectionType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
@@ -29,9 +31,12 @@ final class ConstantArrayTypeBuilder
 {
 
 	public const ARRAY_COUNT_LIMIT = 256;
+	private const ARRAY_CLOSURES_COUNT_LIMIT = 16;
 
 	private bool $degradeToGeneralArray = false;
 
+	private bool $degradeClosures = false;
+
 	private bool $oversized = false;
 
 	/**
@@ -79,6 +84,23 @@ public function setOffsetValueType(?Type $offsetType, Type $valueType, bool $opt
 		}
 
 		if (!$this->degradeToGeneralArray) {
+			if ($valueType instanceof ClosureType) {
+				$numClosures = 1;
+				foreach ($this->valueTypes as $innerType) {
+					if (!($innerType instanceof ClosureType)) {
+						continue;
+					}
+
+					$numClosures++;
+				}
+
+				if ($numClosures >= self::ARRAY_CLOSURES_COUNT_LIMIT) {
+					$this->degradeClosures = true;
+					$this->degradeToGeneralArray = true;
+					$this->oversized = true;
+				}
+			}
+
 			if ($offsetType === null) {
 				$newAutoIndexes = $optional ? $this->nextAutoIndexes : [];
 				$hasOptional = false;
@@ -291,9 +313,20 @@ public function getArray(): Type
 			return new ConstantArrayType($keyTypes, $this->valueTypes, $this->nextAutoIndexes, $this->optionalKeys, $this->isList);
 		}
 
+		$itemTypes = [];
+		foreach ($this->valueTypes as $valueType) {
+			if ($this->degradeClosures && $valueType instanceof ClosureType) {
+				continue;
+			}
+			$itemTypes[] = $valueType;
+		}
+		if ($this->degradeClosures) {
+			$itemTypes[] = new CallableType();
+		}
+
 		$array = new ArrayType(
 			TypeCombinator::union(...$this->keyTypes),
-			TypeCombinator::union(...$this->valueTypes),
+			TypeCombinator::union(...$itemTypes),
 		);
 
 		$types = [];