phpstan · ondrejmirtes · Oct 3, 2024 · Oct 3, 2024
diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
@@ -552,7 +552,7 @@ public function getVariableType(string $variableName): Type
 
 	/**
 	 * @api
-	 * @return array<int, string>
+	 * @return list<string>
 	 */
 	public function getDefinedVariables(): array
 	{
@@ -573,7 +573,7 @@ public function getDefinedVariables(): array
 
 	/**
 	 * @api
-	 * @return array<int, string>
+	 * @return list<string>
 	 */
 	public function getMaybeDefinedVariables(): array
 	{

diff --git a/src/Analyser/StatementResult.php b/src/Analyser/StatementResult.php
@@ -81,7 +81,7 @@ public function getExitPoints(): array
 
 	/**
 	 * @param class-string<Stmt\Continue_>|class-string<Stmt\Break_> $stmtClass
-	 * @return StatementExitPoint[]
+	 * @return list<StatementExitPoint>
 	 */
 	public function getExitPointsByType(string $stmtClass): array
 	{
@@ -115,7 +115,7 @@ public function getExitPointsByType(string $stmtClass): array
 	}
 
 	/**
-	 * @return StatementExitPoint[]
+	 * @return list<StatementExitPoint>
 	 */
 	public function getExitPointsForOuterLoop(): array
 	{

diff --git a/src/PhpDoc/TypeNodeResolver.php b/src/PhpDoc/TypeNodeResolver.php
@@ -107,6 +107,7 @@
 use Traversable;
 use function array_key_exists;
 use function array_map;
+use function array_values;
 use function count;
 use function explode;
 use function get_class;
@@ -927,7 +928,7 @@ private function resolveCallableTypeNode(CallableTypeNode $typeNode, NameScope $
 		$mainType = $this->resolve($typeNode->identifier, $nameScope);
 
 		$isVariadic = false;
-		$parameters = array_map(
+		$parameters = array_values(array_map(
 			function (CallableTypeParameterNode $parameterNode) use ($nameScope, &$isVariadic): NativeParameterReflection {
 				$isVariadic = $isVariadic || $parameterNode->isVariadic;
 				$parameterName = $parameterNode->parameterName;
@@ -945,7 +946,7 @@ function (CallableTypeParameterNode $parameterNode) use ($nameScope, &$isVariadi
 				);
 			},
 			$typeNode->parameters,
-		);
+		));
 
 		$returnType = $this->resolve($typeNode->returnType, $nameScope);
 
@@ -1196,7 +1197,7 @@ private function expandIntMaskToType(Type $type): ?Type
 	/**
 	 * @api
 	 * @param TypeNode[] $typeNodes
-	 * @return Type[]
+	 * @return list<Type>
 	 */
 	public function resolveMultiple(array $typeNodes, NameScope $nameScope): array
 	{

diff --git a/src/Reflection/Annotations/AnnotationMethodReflection.php b/src/Reflection/Annotations/AnnotationMethodReflection.php
@@ -17,11 +17,11 @@
 final class AnnotationMethodReflection implements ExtendedMethodReflection
 {
 
-	/** @var ExtendedFunctionVariant[]|null */
+	/** @var list<ExtendedFunctionVariant>|null */
 	private ?array $variants = null;
 
 	/**
-	 * @param AnnotationsMethodParameterReflection[] $parameters
+	 * @param list<AnnotationsMethodParameterReflection> $parameters
 	 */
 	public function __construct(
 		private string $name,

diff --git a/src/Reflection/Callables/FunctionCallableVariant.php b/src/Reflection/Callables/FunctionCallableVariant.php
@@ -52,7 +52,7 @@ public function getResolvedTemplateTypeMap(): TemplateTypeMap
 	}
 
 	/**
-	 * @return array<int, ExtendedParameterReflection>
+	 * @return list<ExtendedParameterReflection>
 	 */
 	public function getParameters(): array
 	{

diff --git a/src/Reflection/ClassReflection.php b/src/Reflection/ClassReflection.php
@@ -130,7 +130,7 @@ final class ClassReflection
 
 	private false|ResolvedPhpDocBlock $traitContextResolvedPhpDocBlock = false;
 
-	/** @var ClassReflection[]|null */
+	/** @var array<string, ClassReflection>|null */
 	private ?array $cachedInterfaces = null;
 
 	private ClassReflection|false|null $cachedParentClass = false;
@@ -360,7 +360,7 @@ public function getClassHierarchyDistances(): array
 	}
 
 	/**
-	 * @return ReflectionClass[]
+	 * @return list<ReflectionClass>
 	 */
 	private function collectTraits(ReflectionClass|ReflectionEnum $class): array
 	{
@@ -845,7 +845,7 @@ public function implementsInterface(string $className): bool
 	}
 
 	/**
-	 * @return ClassReflection[]
+	 * @return list<ClassReflection>
 	 */
 	public function getParents(): array
 	{
@@ -860,7 +860,7 @@ public function getParents(): array
 	}
 
 	/**
-	 * @return ClassReflection[]
+	 * @return array<string, ClassReflection>
 	 */
 	public function getInterfaces(): array
 	{
@@ -894,7 +894,7 @@ public function getInterfaces(): array
 	}
 
 	/**
-	 * @return ClassReflection[]
+	 * @return array<string, ClassReflection>
 	 */
 	private function collectInterfaces(ClassReflection $interface): array
 	{
@@ -910,7 +910,7 @@ private function collectInterfaces(ClassReflection $interface): array
 	}
 
 	/**
-	 * @return ClassReflection[]
+	 * @return array<string, ClassReflection>
 	 */
 	public function getImmediateInterfaces(): array
 	{
@@ -1102,7 +1102,7 @@ public function hasTraitUse(string $traitName): bool
 	}
 
 	/**
-	 * @return string[]
+	 * @return list<string>
 	 */
 	private function getTraitNames(): array
 	{
@@ -1459,7 +1459,7 @@ public function varianceMapFromList(array $variances): TemplateTypeVarianceMap
 		return new TemplateTypeVarianceMap($map);
 	}
 
-	/** @return array<int, Type> */
+	/** @return list<Type> */
 	public function typeMapToList(TemplateTypeMap $typeMap): array
 	{
 		$resolvedPhpDoc = $this->getResolvedPhpDoc();
@@ -1475,7 +1475,7 @@ public function typeMapToList(TemplateTypeMap $typeMap): array
 		return $list;
 	}
 
-	/** @return array<int, TemplateTypeVariance> */
+	/** @return list<TemplateTypeVariance> */
 	public function varianceMapToList(TemplateTypeVarianceMap $varianceMap): array
 	{
 		$resolvedPhpDoc = $this->getResolvedPhpDoc();
@@ -1775,7 +1775,7 @@ public function getMethodTags(): array
 	}
 
 	/**
-	 * @return array<Type>
+	 * @return list<Type>
 	 */
 	public function getResolvedMixinTypes(): array
 	{

diff --git a/src/Reflection/Dummy/ChangedTypeMethodReflection.php b/src/Reflection/Dummy/ChangedTypeMethodReflection.php
@@ -17,8 +17,8 @@ final class ChangedTypeMethodReflection implements ExtendedMethodReflection
 {
 
 	/**
-	 * @param ExtendedParametersAcceptor[] $variants
-	 * @param ExtendedParametersAcceptor[]|null $namedArgumentsVariants
+	 * @param list<ExtendedParametersAcceptor> $variants
+	 * @param list<ExtendedParametersAcceptor>|null $namedArgumentsVariants
 	 */
 	public function __construct(private ClassReflection $declaringClass, private ExtendedMethodReflection $reflection, private array $variants, private ?array $namedArgumentsVariants)
 	{

diff --git a/src/Reflection/ExtendedCallableFunctionVariant.php b/src/Reflection/ExtendedCallableFunctionVariant.php
@@ -15,7 +15,7 @@ final class ExtendedCallableFunctionVariant extends ExtendedFunctionVariant impl
 {
 
 	/**
-	 * @param array<int, ExtendedParameterReflection> $parameters
+	 * @param list<ExtendedParameterReflection> $parameters
 	 * @param SimpleThrowPoint[] $throwPoints
 	 * @param SimpleImpurePoint[] $impurePoints
 	 * @param InvalidateExprNode[] $invalidateExpressions

diff --git a/src/Reflection/ExtendedFunctionVariant.php b/src/Reflection/ExtendedFunctionVariant.php
@@ -13,7 +13,7 @@ class ExtendedFunctionVariant extends FunctionVariant implements ExtendedParamet
 {
 
 	/**
-	 * @param array<int, ExtendedParameterReflection> $parameters
+	 * @param list<ExtendedParameterReflection> $parameters
 	 * @api
 	 */
 	public function __construct(
@@ -38,11 +38,11 @@ public function __construct(
 	}
 
 	/**
-	 * @return array<int, ExtendedParameterReflection>
+	 * @return list<ExtendedParameterReflection>
 	 */
 	public function getParameters(): array
 	{
-		/** @var array<int, ExtendedParameterReflection> $parameters */
+		/** @var list<ExtendedParameterReflection> $parameters */
 		$parameters = parent::getParameters();
 
 		return $parameters;

diff --git a/src/Reflection/ExtendedMethodReflection.php b/src/Reflection/ExtendedMethodReflection.php
@@ -23,7 +23,7 @@ interface ExtendedMethodReflection extends MethodReflection
 {
 
 	/**
-	 * @return ExtendedParametersAcceptor[]
+	 * @return list<ExtendedParametersAcceptor>
 	 */
 	public function getVariants(): array;
 
@@ -33,7 +33,7 @@ public function getVariants(): array;
 	public function getOnlyVariant(): ExtendedParametersAcceptor;
 
 	/**
-	 * @return ExtendedParametersAcceptor[]|null
+	 * @return list<ExtendedParametersAcceptor>|null
 	 */
 	public function getNamedArgumentsVariants(): ?array;
 

diff --git a/src/Reflection/ExtendedParametersAcceptor.php b/src/Reflection/ExtendedParametersAcceptor.php
@@ -10,7 +10,7 @@ interface ExtendedParametersAcceptor extends ParametersAcceptor
 {
 
 	/**
-	 * @return array<int, ExtendedParameterReflection>
+	 * @return list<ExtendedParameterReflection>
 	 */
 	public function getParameters(): array;
 

diff --git a/src/Reflection/FunctionReflection.php b/src/Reflection/FunctionReflection.php
@@ -14,7 +14,7 @@ public function getName(): string;
 	public function getFileName(): ?string;
 
 	/**
-	 * @return ExtendedParametersAcceptor[]
+	 * @return list<ExtendedParametersAcceptor>
 	 */
 	public function getVariants(): array;
 
@@ -24,7 +24,7 @@ public function getVariants(): array;
 	public function getOnlyVariant(): ExtendedParametersAcceptor;
 
 	/**
-	 * @return ExtendedParametersAcceptor[]|null
+	 * @return list<ExtendedParametersAcceptor>|null
 	 */
 	public function getNamedArgumentsVariants(): ?array;
 

diff --git a/src/Reflection/FunctionVariant.php b/src/Reflection/FunctionVariant.php
@@ -16,7 +16,7 @@ class FunctionVariant implements ParametersAcceptor
 
 	/**
 	 * @api
-	 * @param array<int, ParameterReflection> $parameters
+	 * @param list<ParameterReflection> $parameters
 	 */
 	public function __construct(
 		private TemplateTypeMap $templateTypeMap,
@@ -46,7 +46,7 @@ public function getCallSiteVarianceMap(): TemplateTypeVarianceMap
 	}
 
 	/**
-	 * @return array<int, ParameterReflection>
+	 * @return list<ParameterReflection>
 	 */
 	public function getParameters(): array
 	{

diff --git a/src/Reflection/InaccessibleMethod.php b/src/Reflection/InaccessibleMethod.php
@@ -37,9 +37,6 @@ public function getCallSiteVarianceMap(): TemplateTypeVarianceMap
 		return TemplateTypeVarianceMap::createEmpty();
 	}
 
-	/**
-	 * @return array<int, ParameterReflection>
-	 */
 	public function getParameters(): array
 	{
 		return [];

diff --git a/src/Reflection/MethodReflection.php b/src/Reflection/MethodReflection.php
@@ -14,7 +14,7 @@ public function getName(): string;
 	public function getPrototype(): ClassMemberReflection;
 
 	/**
-	 * @return ParametersAcceptor[]
+	 * @return list<ParametersAcceptor>
 	 */
 	public function getVariants(): array;
 

diff --git a/src/Reflection/Native/NativeFunctionReflection.php b/src/Reflection/Native/NativeFunctionReflection.php
@@ -18,8 +18,8 @@ final class NativeFunctionReflection implements FunctionReflection
 	private TrinaryLogic $returnsByReference;
 
 	/**
-	 * @param ExtendedParametersAcceptor[] $variants
-	 * @param ExtendedParametersAcceptor[]|null $namedArgumentsVariants
+	 * @param list<ExtendedParametersAcceptor> $variants
+	 * @param list<ExtendedParametersAcceptor>|null $namedArgumentsVariants
 	 */
 	public function __construct(
 		private string $name,

diff --git a/src/Reflection/Native/NativeMethodReflection.php b/src/Reflection/Native/NativeMethodReflection.php
@@ -22,8 +22,8 @@ final class NativeMethodReflection implements ExtendedMethodReflection
 {
 
 	/**
-	 * @param ExtendedParametersAcceptor[] $variants
-	 * @param ExtendedParametersAcceptor[]|null $namedArgumentsVariants
+	 * @param list<ExtendedParametersAcceptor> $variants
+	 * @param list<ExtendedParametersAcceptor>|null $namedArgumentsVariants
 	 */
 	public function __construct(
 		private ReflectionProvider $reflectionProvider,

diff --git a/src/Reflection/ParametersAcceptor.php b/src/Reflection/ParametersAcceptor.php
@@ -20,7 +20,7 @@ public function getTemplateTypeMap(): TemplateTypeMap;
 	public function getResolvedTemplateTypeMap(): TemplateTypeMap;
 
 	/**
-	 * @return array<int, ParameterReflection>
+	 * @return list<ParameterReflection>
 	 */
 	public function getParameters(): array;
-Original file line number
+Diff line change
@@ Expand Up / @@ -52,7 +52,7 @@ public function getResolvedTemplateTypeMap(): TemplateTypeMap @@
     	}
     	/**
-    	 * @return array<int, ExtendedParameterReflection>
+    	 * @return list<ExtendedParameterReflection>
     	 */
     	public function getParameters(): array
     	{
@@ Expand Down @@