More precise types

Author: staabm

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

@@ -399,14 +399,14 @@ public static function union(Type ...$types): Type
 
 			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);
 	}
 
 	/**
@@ -564,7 +564,7 @@ private static function compareTypesInUnion(Type $a, Type $b): ?array
 	}
 
 	/**
-	 * @return array<Type>
+	 * @return list<Type>
 	 */
 	private static function getAccessoryCaseStringTypes(Type $type): array
 	{
@@ -704,7 +704,7 @@ private static function intersectWithSubtractedType(
 
 	/**
 	 * @param Type[] $arrayTypes
-	 * @return Type[]
+	 * @return list<Type>
 	 */
 	private static function processArrayAccessoryTypes(array $arrayTypes): array
 	{
@@ -1497,7 +1497,7 @@ public static function intersect(Type ...$types): Type
 			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
 	{