fix

Author: staabm

src/Analyser/ArgumentsNormalizer.php

@@ -182,8 +182,8 @@ public static function reorderNewArguments(
 	}
 
 	/**
-	 * @param Arg[] $callArgs
-	 * @return ?array<int, Arg>
+	 * @param list<Arg> $callArgs
+	 * @return ?list<Arg>
 	 */
 	public static function reorderArgs(ParametersAcceptor $parametersAcceptor, array $callArgs): ?array
 	{
@@ -322,6 +322,10 @@ public static function reorderArgs(ParametersAcceptor $parametersAcceptor, array
 			$reorderedArgs[] = $arg;
 		}
 
+		if (!array_is_list($reorderedArgs)) {
+			throw new ShouldNotHappenException();
+		}
+
 		return $reorderedArgs;
 	}
 

src/Analyser/NodeScopeResolver.php

@@ -4455,7 +4455,7 @@ private function getMethodThrowPoint(MethodReflection $methodReflection, Paramet
 	}
 
 	/**
-	 * @param Node\Arg[] $args
+	 * @param list<Node\Arg> $args
 	 */
 	private function getConstructorThrowPoint(MethodReflection $constructorReflection, ParametersAcceptor $parametersAcceptor, ClassReflection $classReflection, New_ $new, Name $className, array $args, MutatingScope $scope): ?ThrowPoint
 	{

src/Reflection/ParametersAcceptorSelector.php

@@ -471,6 +471,9 @@ public static function selectFromArgs(
 		$parameters = null;
 		$singleParametersAcceptor = null;
 		if (count($parametersAcceptors) === 1) {
+			if (!array_is_list($args)) {
+				throw new ShouldNotHappenException('args is expected to be a list');
+			}
 			$reorderedArgs = ArgumentsNormalizer::reorderArgs($parametersAcceptors[0], $args);
 			$singleParametersAcceptor = $parametersAcceptors[0];
 		}

src/Rules/Functions/RandomIntParametersRule.php

@@ -49,7 +49,7 @@ public function processNode(Node $node, Scope $scope): array
 			return [];
 		}
 
-		$args = array_values($node->getArgs());
+		$args = $node->getArgs();
 		if (count($args) < 2) {
 			return [];
 		}

tests/PHPStan/Analyser/ArgumentsNormalizerLegacyTest.php

@@ -49,11 +49,9 @@ public function testArgumentReorderAllNamed(): void
 		$reorderedArgs = $funcCall->getArgs();
 		$this->assertCount(2, $reorderedArgs);
 
-		$this->assertArrayHasKey(0, $reorderedArgs);
 		$this->assertNull($reorderedArgs[0]->name, 'named-arg turned into regular numeric arg');
 		$this->assertInstanceOf(String_::class, $reorderedArgs[0]->value, 'value-arg at the right position');
 
-		$this->assertArrayHasKey(1, $reorderedArgs);
 		$this->assertNull($reorderedArgs[1]->name, 'named-arg turned into regular numeric arg');
 		$this->assertInstanceOf(LNumber::class, $reorderedArgs[1]->value, 'flags-arg at the right position');
 		$this->assertSame(0, $reorderedArgs[1]->value->value);
@@ -90,17 +88,14 @@ public function testArgumentReorderAllNamedWithSkipped(): void
 		$reorderedArgs = $funcCall->getArgs();
 		$this->assertCount(3, $reorderedArgs);
 
-		$this->assertArrayHasKey(0, $reorderedArgs);
 		$this->assertNull($reorderedArgs[0]->name, 'named-arg turned into regular numeric arg');
 		$this->assertInstanceOf(String_::class, $reorderedArgs[0]->value, 'value-arg at the right position');
 
-		$this->assertArrayHasKey(1, $reorderedArgs);
 		$this->assertNull($reorderedArgs[1]->name, 'named-arg turned into regular numeric arg');
 		$this->assertInstanceOf(TypeExpr::class, $reorderedArgs[1]->value, 'flags-arg at the right position');
 		$this->assertInstanceOf(ConstantIntegerType::class, $reorderedArgs[1]->value->getExprType());
 		$this->assertSame(0, $reorderedArgs[1]->value->getExprType()->getValue(), 'flags-arg with default value');
 
-		$this->assertArrayHasKey(2, $reorderedArgs);
 		$this->assertNull($reorderedArgs[2]->name, 'named-arg turned into regular numeric arg');
 		$this->assertInstanceOf(LNumber::class, $reorderedArgs[2]->value, 'depth-arg at the right position');
 		$this->assertSame(128, $reorderedArgs[2]->value->value);
@@ -153,10 +148,7 @@ public function testLeaveRegularCallAsIs(): void
 		$reorderedArgs = $funcCall->getArgs();
 		$this->assertCount(2, $reorderedArgs);
 
-		$this->assertArrayHasKey(0, $reorderedArgs);
 		$this->assertInstanceOf(String_::class, $reorderedArgs[0]->value, 'value-arg at unchanged position');
-
-		$this->assertArrayHasKey(1, $reorderedArgs);
 		$this->assertInstanceOf(LNumber::class, $reorderedArgs[1]->value, 'flags-arg at unchanged position');
 		$this->assertSame(0, $reorderedArgs[1]->value->value);
 	}