Use named argument in error for variadic types

When a type is variadic, and multiple named arguments are used, it's often hard
to tell for which argument the error is coming.

Since we have the named argument, we could use it in this situation.

Author: ruudk

src/Rules/AttributesCheck.php

@@ -143,7 +143,7 @@ public function check(
 						'Attribute class ' . $attributeClassName . ' constructor invoked with %d parameters, at least %d required.',
 						'Attribute class ' . $attributeClassName . ' constructor invoked with %d parameter, %d-%d required.',
 						'Attribute class ' . $attributeClassName . ' constructor invoked with %d parameters, %d-%d required.',
-						'Parameter %s of attribute class ' . $attributeClassName . ' constructor expects %s, %s given.',
+						'Parameter %s of attribute class ' . $attributeClassName . ' constructor expects %s, %s given%s.',
 						'', // constructor does not have a return type
 						'Parameter %s of attribute class ' . $attributeClassName . ' constructor is passed by reference, so it expects variables only',
 						'Unable to resolve the template type %s in instantiation of attribute class ' . $attributeClassName,

src/Rules/Classes/InstantiationRule.php

@@ -208,7 +208,7 @@ private function checkClassName(string $class, bool $isName, Node $node, Scope $
 				'Class ' . $classDisplayName . ' constructor invoked with %d parameters, at least %d required.',
 				'Class ' . $classDisplayName . ' constructor invoked with %d parameter, %d-%d required.',
 				'Class ' . $classDisplayName . ' constructor invoked with %d parameters, %d-%d required.',
-				'Parameter %s of class ' . $classDisplayName . ' constructor expects %s, %s given.',
+				'Parameter %s of class ' . $classDisplayName . ' constructor expects %s, %s given%s.',
 				'', // constructor does not have a return type
 				'Parameter %s of class ' . $classDisplayName . ' constructor is passed by reference, so it expects variables only',
 				'Unable to resolve the template type %s in instantiation of class ' . $classDisplayName,

src/Rules/FunctionCallParametersCheck.php

@@ -324,6 +324,10 @@ public function check(
 							$this->describeParameter($parameter, $argumentName === null ? $i + 1 : null),
 							$parameterType->describe($verbosityLevel),
 							$argumentValueType->describe($verbosityLevel),
+							$parameter->isVariadic() && $argumentName !== null ? sprintf(
+								' as named argument %s',
+								$argumentName,
+							) : '',
 						))
 							->identifier('argument.type')
 							->line($argumentLine)

src/Rules/Functions/CallCallablesRule.php

@@ -124,7 +124,7 @@ public function processNode(
 					ucfirst($callableDescription) . ' invoked with %d parameters, at least %d required.',
 					ucfirst($callableDescription) . ' invoked with %d parameter, %d-%d required.',
 					ucfirst($callableDescription) . ' invoked with %d parameters, %d-%d required.',
-					'Parameter %s of ' . $callableDescription . ' expects %s, %s given.',
+					'Parameter %s of ' . $callableDescription . ' expects %s, %s given%s.',
 					'Result of ' . $callableDescription . ' (void) is used.',
 					'Parameter %s of ' . $callableDescription . ' is passed by reference, so it expects variables only.',
 					'Unable to resolve the template type %s in call to ' . $callableDescription,

src/Rules/Functions/CallToFunctionParametersRule.php

@@ -56,7 +56,7 @@ public function processNode(Node $node, Scope $scope): array
 				'Function ' . $functionName . ' invoked with %d parameters, at least %d required.',
 				'Function ' . $functionName . ' invoked with %d parameter, %d-%d required.',
 				'Function ' . $functionName . ' invoked with %d parameters, %d-%d required.',
-				'Parameter %s of function ' . $functionName . ' expects %s, %s given.',
+				'Parameter %s of function ' . $functionName . ' expects %s, %s given%s.',
 				'Result of function ' . $functionName . ' (void) is used.',
 				'Parameter %s of function ' . $functionName . ' is passed by reference, so it expects variables only.',
 				'Unable to resolve the template type %s in call to function ' . $functionName,

src/Rules/Functions/CallUserFuncRule.php

@@ -67,7 +67,7 @@ public function processNode(Node $node, Scope $scope): array
 			ucfirst($callableDescription) . ' invoked with %d parameters, at least %d required.',
 			ucfirst($callableDescription) . ' invoked with %d parameter, %d-%d required.',
 			ucfirst($callableDescription) . ' invoked with %d parameters, %d-%d required.',
-			'Parameter %s of ' . $callableDescription . ' expects %s, %s given.',
+			'Parameter %s of ' . $callableDescription . ' expects %s, %s given%s.',
 			'Result of ' . $callableDescription . ' (void) is used.',
 			'Parameter %s of ' . $callableDescription . ' is passed by reference, so it expects variables only.',
 			'Unable to resolve the template type %s in call to ' . $callableDescription,

src/Rules/Methods/CallMethodsRule.php

@@ -62,7 +62,7 @@ public function processNode(Node $node, Scope $scope): array
 				'Method ' . $messagesMethodName . ' invoked with %d parameters, at least %d required.',
 				'Method ' . $messagesMethodName . ' invoked with %d parameter, %d-%d required.',
 				'Method ' . $messagesMethodName . ' invoked with %d parameters, %d-%d required.',
-				'Parameter %s of method ' . $messagesMethodName . ' expects %s, %s given.',
+				'Parameter %s of method ' . $messagesMethodName . ' expects %s, %s given%s.',
 				'Result of method ' . $messagesMethodName . ' (void) is used.',
 				'Parameter %s of method ' . $messagesMethodName . ' is passed by reference, so it expects variables only.',
 				'Unable to resolve the template type %s in call to method ' . $messagesMethodName,

src/Rules/Methods/CallStaticMethodsRule.php

@@ -70,7 +70,7 @@ public function processNode(Node $node, Scope $scope): array
 				$displayMethodName . ' invoked with %d parameters, at least %d required.',
 				$displayMethodName . ' invoked with %d parameter, %d-%d required.',
 				$displayMethodName . ' invoked with %d parameters, %d-%d required.',
-				'Parameter %s of ' . $lowercasedMethodName . ' expects %s, %s given.',
+				'Parameter %s of ' . $lowercasedMethodName . ' expects %s, %s given%s.',
 				'Result of ' . $lowercasedMethodName . ' (void) is used.',
 				'Parameter %s of ' . $lowercasedMethodName . ' is passed by reference, so it expects variables only.',
 				'Unable to resolve the template type %s in call to method ' . $lowercasedMethodName,

tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php

@@ -1903,7 +1903,7 @@ public function testNamedArguments(): void
 				91,
 			],
 			[
-				'Parameter ...$args of method NamedArgumentsMethod\Foo::doIpsum() expects string, int given.',
+				'Parameter ...$args of method NamedArgumentsMethod\Foo::doIpsum() expects string, int given as named argument foo.',
 				91,
 			],
 			[
@@ -1918,6 +1918,14 @@ public function testNamedArguments(): void
 				'Unpacked argument (...) cannot be followed by a non-unpacked argument.',
 				94,
 			],
+			[
+				'Parameter ...$args of method NamedArgumentsMethod\Foo::doIpsum() expects string, int given as named argument foo.',
+				95,
+			],
+			[
+				'Parameter ...$args of method NamedArgumentsMethod\Foo::doIpsum() expects string, int given as named argument bar.',
+				95,
+			]
 		]);
 	}
 

tests/PHPStan/Rules/Methods/data/named-arguments.php

@@ -92,6 +92,7 @@ public function doDolor(): void
 		$this->doIpsum(...['a' => 1, 'foo' => 'foo']);
 		$this->doIpsum(...['b' => 1, 'foo' => 'foo']);
 		$this->doIpsum(...[1, 2], 'foo');
+		$this->doIpsum(1, 2, foo: 1, bar: 2);
 	}
 
 }