ArgumentsNormalizer - keep named arguments for unknown parameters

ondrejmirtes · ondrejmirtes · commit ad34452cb12c · 2024-02-23T15:55:32.000+01:00
diff --git a/src/Analyser/ArgumentsNormalizer.php b/src/Analyser/ArgumentsNormalizer.php
@@ -191,6 +191,7 @@ private static function reorderArgs(ParametersAcceptor $parametersAcceptor, Call
 
 		$reorderedArgs = [];
 		$additionalNamedArgs = [];
+		$appendArgs = [];
 		foreach ($callArgs as $i => $arg) {
 			if ($arg->name === null) {
 				// add regular args as is
@@ -209,6 +210,15 @@ private static function reorderArgs(ParametersAcceptor $parametersAcceptor, Call
 				);
 			} else {
 				if (!$hasVariadic) {
+					$attributes = $arg->getAttributes();
+					$attributes[self::ORIGINAL_ARG_ATTRIBUTE] = $arg;
+					$appendArgs[] = new Arg(
+						$arg->value,
+						$arg->byRef,
+						$arg->unpack,
+						$attributes,
+						null,
+					);
 					continue;
 				}
 
@@ -235,7 +245,10 @@ private static function reorderArgs(ParametersAcceptor $parametersAcceptor, Call
 		}
 
 		if (count($reorderedArgs) === 0) {
-			return [];
+			foreach ($appendArgs as $arg) {
+				$reorderedArgs[] = $arg;
+			}
+			return $reorderedArgs;
 		}
 
 		// fill up all wholes with default values until the last given argument
@@ -269,6 +282,10 @@ private static function reorderArgs(ParametersAcceptor $parametersAcceptor, Call
 
 		ksort($reorderedArgs);
 
+		foreach ($appendArgs as $arg) {
+			$reorderedArgs[] = $arg;
+		}
+
 		return $reorderedArgs;
 	}
 
diff --git a/tests/PHPStan/Analyser/ArgumentsNormalizerTest.php b/tests/PHPStan/Analyser/ArgumentsNormalizerTest.php
@@ -222,7 +222,9 @@ public function dataReorderValid(): iterable
 			[
 				[new StringType(), 'onee'],
 			],
-			[],
+			[
+				new StringType(),
+			],
 		];
 
 		yield [
@@ -237,6 +239,7 @@ public function dataReorderValid(): iterable
 			],
 			[
 				new IntegerType(),
+				new StringType(),
 			],
 		];
 	}
diff --git a/tests/PHPStan/Rules/DeadCode/UnusedPrivatePropertyRuleTest.php b/tests/PHPStan/Rules/DeadCode/UnusedPrivatePropertyRuleTest.php
@@ -304,4 +304,15 @@ public function testBug10059(): void
 		$this->analyse([__DIR__ . '/data/bug-10059.php'], []);
 	}
 
+	public function testBug10628(): void
+	{
+		if (PHP_VERSION_ID < 80000) {
+			$this->markTestSkipped('Test requires PHP 8.0.');
+		}
+
+		$this->alwaysWrittenTags = [];
+		$this->alwaysReadTags = [];
+		$this->analyse([__DIR__ . '/data/bug-10628.php'], []);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/DeadCode/data/bug-10628.php b/tests/PHPStan/Rules/DeadCode/data/bug-10628.php
@@ -0,0 +1,32 @@
+<?php declare(strict_types = 1); // lint >= 8.0
+
+namespace Bug10628;
+
+use stdClass;
+
+interface Bar
+{
+
+	public function bazName(): string;
+
+}
+
+final class Foo
+{
+	public function __construct(
+		private Bar $bar,
+	) {
+	}
+
+	public function __invoke(): stdClass
+	{
+		return $this->getMixed()->get(
+			name: $this->bar->bazName(),
+		);
+	}
+
+	public function getMixed(): mixed
+	{
+
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,9 @@ public function dataReorderValid(): iterable`
`222`	`222`	`[`
`223`	`223`	`[new StringType(), 'onee'],`
`224`	`224`	`],`
`225`		`- [],`
	`225`	`+ [`
	`226`	`+ new StringType(),`
	`227`	`+ ],`
`226`	`228`	`];`
`227`	`229`
`228`	`230`	`yield [`
`@@ -237,6 +239,7 @@ public function dataReorderValid(): iterable`
`237`	`239`	`],`
`238`	`240`	`[`
`239`	`241`	`new IntegerType(),`
	`242`	`+ new StringType(),`
`240`	`243`	`],`
`241`	`244`	`];`
`242`	`245`	`}`