ArgumentsNormalizer - skip unused arguments in non-variadic signature…

…s, still return a normalized call
phpstan · Feb 15, 2024 · 17e5bac · 17e5bac
1 parent cfedc7b
commit 17e5bac
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 29 deletions.
diff --git a/src/Analyser/ArgumentsNormalizer.php b/src/Analyser/ArgumentsNormalizer.php
@@ -209,7 +209,7 @@ private static function reorderArgs(ParametersAcceptor $parametersAcceptor, Call
 				);
 			} else {
 				if (!$hasVariadic) {
-					return null;
+					continue;
 				}
 
 				$attributes = $arg->getAttributes();

diff --git a/src/Rules/Functions/ArrayValuesRule.php b/src/Rules/Functions/ArrayValuesRule.php
@@ -56,7 +56,7 @@ public function processNode(Node $node, Scope $scope): array
 			$scope,
 			$node->getArgs(),
 			$functionReflection->getVariants(),
-			null,
+			$functionReflection->getNamedArgumentsVariants(),
 		);
 
 		$normalizedFuncCall = ArgumentsNormalizer::reorderFuncArguments($parametersAcceptor, $node);
@@ -66,8 +66,7 @@ public function processNode(Node $node, Scope $scope): array
 		}
 
 		$args = $normalizedFuncCall->getArgs();
-
-		if (count($args) !== 1) {
+		if (count($args) === 0) {
 			return [];
 		}
 

diff --git a/tests/PHPStan/Analyser/ArgumentsNormalizerTest.php b/tests/PHPStan/Analyser/ArgumentsNormalizerTest.php
@@ -202,6 +202,43 @@ public function dataReorderValid(): iterable
 				new StringType(),
 			],
 		];
+
+		yield [
+			[
+				['one', true, false, new IntegerType()],
+				['two', true, false, new StringType()],
+				['three', true, false, new FloatType()],
+			],
+			[],
+			[],
+		];
+
+		yield [
+			[
+				['one', true, false, new IntegerType()],
+				['two', true, false, new StringType()],
+				['three', true, false, new FloatType()],
+			],
+			[
+				[new StringType(), 'onee'],
+			],
+			[],
+		];
+
+		yield [
+			[
+				['one', true, false, new IntegerType()],
+				['two', true, false, new StringType()],
+				['three', true, false, new FloatType()],
+			],
+			[
+				[new IntegerType(), null],
+				[new StringType(), 'onee'],
+			],
+			[
+				new IntegerType(),
+			],
+		];
 	}
 
 	/**
@@ -282,29 +319,6 @@ public function dataReorderInvalid(): iterable
 				[new StringType(), 'three'],
 			],
 		];
-
-		yield [
-			[
-				['one', true, false, new IntegerType()],
-				['two', true, false, new StringType()],
-				['three', true, false, new FloatType()],
-			],
-			[
-				[new StringType(), 'onee'],
-			],
-		];
-
-		yield [
-			[
-				['one', true, false, new IntegerType()],
-				['two', true, false, new StringType()],
-				['three', true, false, new FloatType()],
-			],
-			[
-				[new IntegerType(), null],
-				[new StringType(), 'onee'],
-			],
-		];
 	}
 
 	/**

diff --git a/tests/PHPStan/Rules/Functions/data/array_values_list.php b/tests/PHPStan/Rules/Functions/data/array_values_list.php
@@ -20,5 +20,5 @@
 array_values([null, 0]);
 array_values([]);
 
-array_values(array: $array);
-array_values(array: $list);
+array_values(unused: true, array: $array);
+array_values(unused: true, array: $list);