ConstantArrayTypeBuilder - generalize key types and value types in degraded general array

ondrejmirtes · ondrejmirtes · commit dbdcb817fced · 2022-08-11T13:40:40.000+02:00
diff --git a/src/Type/ArrayType.php b/src/Type/ArrayType.php
@@ -293,7 +293,7 @@ public function setOffsetValueType(?Type $offsetType, Type $valueType, bool $uni
 			}
 		}
 
-		$array = new self($keyType, $itemType,);
+		$array = new self($keyType, $itemType);
 		if ($offsetType instanceof ConstantIntegerType || $offsetType instanceof ConstantStringType) {
 			return TypeCombinator::intersect($array, new HasOffsetValueType($offsetType, $valueType), new NonEmptyArrayType());
 		}
diff --git a/src/Type/Constant/ConstantArrayTypeBuilder.php b/src/Type/Constant/ConstantArrayTypeBuilder.php
@@ -5,6 +5,7 @@
 use PHPStan\ShouldNotHappenException;
 use PHPStan\Type\Accessory\NonEmptyArrayType;
 use PHPStan\Type\ArrayType;
+use PHPStan\Type\GeneralizePrecision;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
 use PHPStan\Type\TypeUtils;
@@ -266,10 +267,16 @@ public function getArray(): Type
 			return new ConstantArrayType($keyTypes, $this->valueTypes, $this->nextAutoIndexes, $this->optionalKeys);
 		}
 
-		$array = new ArrayType(
-			TypeCombinator::union(...$this->keyTypes),
-			TypeCombinator::union(...$this->valueTypes),
-		);
+		$keyType = TypeCombinator::union(...$this->keyTypes);
+		if (count(TypeUtils::getConstantScalars($keyType)) > self::ARRAY_COUNT_LIMIT) {
+			$keyType = $keyType->generalize(GeneralizePrecision::moreSpecific());
+		}
+		$valueType = TypeCombinator::union(...$this->valueTypes);
+		if (count(TypeUtils::getConstantScalars($valueType)) > self::ARRAY_COUNT_LIMIT) {
+			$valueType = $valueType->generalize(GeneralizePrecision::moreSpecific());
+		}
+
+		$array = new ArrayType($keyType, $valueType);
 
 		if (count($this->optionalKeys) < $keyTypesCount) {
 			return TypeCombinator::intersect($array, new NonEmptyArrayType());

Original file line number	Diff line number	Diff line change
`@@ -293,7 +293,7 @@ public function setOffsetValueType(?Type $offsetType, Type $valueType, bool $uni`
`293`	`293`	`}`
`294`	`294`	`}`
`295`	`295`
`296`		`- $array = new self($keyType, $itemType,);`
	`296`	`+ $array = new self($keyType, $itemType);`
`297`	`297`	`if ($offsetType instanceof ConstantIntegerType \|\| $offsetType instanceof ConstantStringType) {`
`298`	`298`	`return TypeCombinator::intersect($array, new HasOffsetValueType($offsetType, $valueType), new NonEmptyArrayType());`
`299`	`299`	`}`