More precise types

src/Type/BenevolentUnionType.php

@@ -12,7 +12,7 @@ class BenevolentUnionType extends UnionType
 
 	/**
 	 * @api
-	 * @param Type[] $types
+	 * @param list<Type> $types
 	 */
 	public function __construct(array $types, bool $normalized = false)
 	{

src/Type/Constant/ConstantArrayType.php

@@ -95,7 +95,7 @@ class ConstantArrayType implements Type
 
 	/**
 	 * @api
-	 * @param array<int, ConstantIntegerType|ConstantStringType> $keyTypes
+	 * @param list<ConstantIntegerType|ConstantStringType> $keyTypes
 	 * @param array<int, Type> $valueTypes
 	 * @param non-empty-list<int> $nextAutoIndexes
 	 * @param int[] $optionalKeys
@@ -280,7 +280,7 @@ private function powerSet(array $in): array
 	}
 
 	/**
-	 * @return array<int, ConstantIntegerType|ConstantStringType>
+	 * @return list<ConstantIntegerType|ConstantStringType>
 	 */
 	public function getKeyTypes(): array
 	{

src/Type/Constant/ConstantArrayTypeBuilder.php

@@ -40,7 +40,7 @@ final class ConstantArrayTypeBuilder
 	private bool $oversized = false;
 
 	/**
-	 * @param array<int, Type> $keyTypes
+	 * @param list<Type> $keyTypes
 	 * @param array<int, Type> $valueTypes
 	 * @param non-empty-list<int> $nextAutoIndexes
 	 * @param array<int> $optionalKeys
@@ -308,7 +308,7 @@ public function getArray(): Type
 		}
 
 		if (!$this->degradeToGeneralArray) {
-			/** @var array<int, ConstantIntegerType|ConstantStringType> $keyTypes */
+			/** @var list<ConstantIntegerType|ConstantStringType> $keyTypes */
 			$keyTypes = $this->keyTypes;
 			return new ConstantArrayType($keyTypes, $this->valueTypes, $this->nextAutoIndexes, $this->optionalKeys, $this->isList);
 		}

src/Type/Generic/TemplateBenevolentUnionType.php

@@ -34,7 +34,7 @@ public function __construct(
 		$this->default = $default;
 	}
 
-	/** @param Type[] $types */
+	/** @param list<Type> $types */
 	public function withTypes(array $types): self
 	{
 		return new self(

src/Type/IntersectionType.php

@@ -71,7 +71,7 @@ class IntersectionType implements CompoundType
 
 	/**
 	 * @api
-	 * @param Type[] $types
+	 * @param list<Type> $types
 	 */
 	public function __construct(private array $types)
 	{
@@ -85,15 +85,15 @@ public function __construct(private array $types)
 	}
 
 	/**
-	 * @return Type[]
+	 * @return list<Type>
 	 */
 	public function getTypes(): array
 	{
 		return $this->types;
 	}
 
 	/**
-	 * @return Type[]
+	 * @return list<Type>
 	 */
 	private function getSortedTypes(): array
 	{

src/Type/OperatorTypeSpecifyingExtensionRegistry.php

@@ -32,7 +32,7 @@ public function callOperatorTypeSpecifyingExtensions(Expr\BinaryOp $expr, Type $
 		$operatorSigil = $expr->getOperatorSigil();
 		$operatorTypeSpecifyingExtensions = $this->getOperatorTypeSpecifyingExtensions($operatorSigil, $leftType, $rightType);
 
-		/** @var Type[] $extensionTypes */
+		/** @var list<Type> $extensionTypes */
 		$extensionTypes = [];
 
 		foreach ($operatorTypeSpecifyingExtensions as $extension) {

src/Type/Php/ArrayMapFunctionReturnTypeExtension.php

@@ -180,7 +180,7 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 	}
 
 	/**
-	 * @return AccessoryType[]
+	 * @return list<AccessoryType>
 	 */
 	private function getAccessoryTypes(Type $arrayType, Type $valueType): array
 	{

src/Type/Php/MinMaxFunctionReturnTypeExtension.php

@@ -150,7 +150,7 @@ private function processArrayType(string $functionName, Type $argType): Type
 	}
 
 	/**
-	 * @param Type[] $types
+	 * @param list<Type> $types
 	 */
 	private function processType(
 		string $functionName,

src/Type/TypeCombinator.php

@@ -381,14 +381,14 @@
 
 			if ($tempTypes === []) {
 				if ($benevolentUnionObject instanceof TemplateBenevolentUnionType) {
-					return $benevolentUnionObject->withTypes($types);
+					return $benevolentUnionObject->withTypes(array_values($types));
 				}
 
-				return new BenevolentUnionType($types, true);
+				return new BenevolentUnionType(array_values($types), true);
 			}
 		}
 
-		return new UnionType($types, true);
+		return new UnionType(array_values($types), true);
 	}
 
 	/**
@@ -546,7 +546,7 @@
 	}
 
 	/**
-	 * @return array<Type>
+	 * @return list<Type>
 	 */
 	private static function getAccessoryCaseStringTypes(Type $type): array
 	{
@@ -686,7 +686,7 @@
 
 	/**
 	 * @param Type[] $arrayTypes
-	 * @return Type[]
+	 * @return list<Type>
 	 */
 	private static function processArrayAccessoryTypes(array $arrayTypes): array
 	{
@@ -1098,7 +1098,7 @@
 					unset($arraysToProcess[$i]);
 					continue 2;
 				}
 			}
 		}
 
 		return array_merge($newArrays, $arraysToProcess);
@@ -1473,7 +1473,7 @@
 			return $types[0];
 		}
 
-		return new IntersectionType($types);
+		return new IntersectionType(array_values($types));
 	}
 
 	public static function removeFalsey(Type $type): Type

src/Type/TypeUtils.php

@@ -210,7 +210,7 @@ public static function getHasPropertyTypes(Type $type): array
 	}
 
 	/**
-	 * @return AccessoryType[]
+	 * @return list<AccessoryType>
 	 */
 	public static function getAccessoryTypes(Type $type): array
 	{

src/Type/UnionType.php

@@ -63,7 +63,7 @@ class UnionType implements CompoundType
 
 	/**
 	 * @api
-	 * @param Type[] $types
+	 * @param list<Type> $types
 	 */
 	public function __construct(private array $types, private bool $normalized = false)
 	{
@@ -90,7 +90,7 @@ public function __construct(private array $types, private bool $normalized = fal
 	}
 
 	/**
-	 * @return Type[]
+	 * @return list<Type>
 	 */
 	public function getTypes(): array
 	{
@@ -126,7 +126,7 @@ public function isNormalized(): bool
 	}
 
 	/**
-	 * @return Type[]
+	 * @return list<Type>
 	 */
 	protected function getSortedTypes(): array
 	{

src/Type/UnionTypeHelper.php

@@ -16,8 +16,9 @@ final class UnionTypeHelper
 {
 
 	/**
-	 * @param Type[] $types
-	 * @return Type[]
+	 * @template T of Type
+	 * @param list<T> $types
+	 * @return list<T>
 	 */
 	public static function sortTypes(array $types): array
 	{

tests/PHPStan/Type/TypeCombinatorTest.php

@@ -2805,7 +2805,7 @@ public static function dataUnion(): iterable
 	}
 
 	/**
-	 * @param Type[] $types
+	 * @param list<Type> $types
 	 * @param class-string<Type> $expectedTypeClass
 	 */
 	#[DataProvider('dataUnion')]
@@ -2861,7 +2861,7 @@ public function testUnion(
 	}
 
 	/**
-	 * @param Type[] $types
+	 * @param list<Type> $types
 	 * @param class-string<Type> $expectedTypeClass
 	 */
 	#[DataProvider('dataUnion')]
@@ -4760,7 +4760,7 @@ public static function dataIntersect(): iterable
 	}
 
 	/**
-	 * @param Type[] $types
+	 * @param list<Type> $types
 	 * @param class-string<Type> $expectedTypeClass
 	 */
 	#[DataProvider('dataIntersect')]
@@ -4803,7 +4803,7 @@ public function testIntersect(
 	}
 
 	/**
-	 * @param Type[] $types
+	 * @param list<Type> $types
 	 * @param class-string<Type> $expectedTypeClass
 	 */
 	#[DataProvider('dataIntersect')]

tests/PHPStan/Type/UnionTypeTest.php

@@ -1411,7 +1411,7 @@ public function testSorting(): void
 	}
 
 	/**
-	 * @param Type[] $types
+	 * @param list<Type> $types
 	 * @param list<string> $expectedDescriptions
 	 */
 	#[DataProvider('dataGetConstantArrays')]