Fix ArgumentsNormalizer - do not overwrite already passed args

ondrejmirtes · ondrejmirtes · commit 7bdd17221f67 · 2026-01-03T20:07:17.000+01:00
diff --git a/src/Analyser/ArgumentsNormalizer.php b/src/Analyser/ArgumentsNormalizer.php
@@ -239,6 +239,9 @@ public static function reorderArgs(ParametersAcceptor $parametersAcceptor, array
 				// order named args into the position the signature expects them
 				$attributes = $arg->getAttributes();
 				$attributes[self::ORIGINAL_ARG_ATTRIBUTE] = $arg;
+				if (array_key_exists($argumentPositions[$argName], $reorderedArgs)) {
+					continue;
+				}
 				$reorderedArgs[$argumentPositions[$argName]] = new Arg(
 					$arg->value,
 					$arg->byRef,
diff --git a/tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php b/tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php
@@ -1926,6 +1926,14 @@ public function testNamedArguments(): void
 				'Named argument bar for variadic parameter ...$args of method NamedArgumentsMethod\Foo::doIpsum() expects string, int given.',
 				95,
 			],
+			[
+				'Argument for parameter $i has already been passed.',
+				116,
+			],
+			[
+				'Call to an undefined method NamedArgumentsMethod\Bar::doBaz().',
+				115,
+			],
 		]);
 	}
 
diff --git a/tests/PHPStan/Rules/Methods/data/named-arguments.php b/tests/PHPStan/Rules/Methods/data/named-arguments.php
@@ -96,3 +96,27 @@ public function doDolor(): void
 	}
 
 }
+
+class Bar
+{
+
+	public function doFoo(
+		int $i,
+		int $j,
+		int $k, ?int $l = null
+	)
+	{
+
+	}
+
+	public function doBar(): void
+	{
+		$this->doFoo(
+			$this->doBaz(),
+			i: 1,
+			j: 2,
+			k: 3
+		);
+	}
+
+}
