Named arguments - type mismatch

ondrejmirtes · ondrejmirtes · commit 65e4cec84053 · 2020-11-16T15:55:07.000+01:00
diff --git a/src/Rules/FunctionCallParametersCheck.php b/src/Rules/FunctionCallParametersCheck.php
@@ -255,9 +255,14 @@ static function (Type $type): bool {
 				&& !$this->ruleLevelHelper->accepts($parameterType, $argumentValueType, $scope->isDeclareStrictTypes())
 			) {
 				$verbosityLevel = VerbosityLevel::getRecommendedLevelByType($parameterType);
+				$parameterDescription = sprintf('%s$%s', $parameter->isVariadic() ? '...' : '', $parameter->getName());
 				$errors[] = RuleErrorBuilder::message(sprintf(
 					$messages[6],
-					sprintf('#%d %s', $i + 1, sprintf('%s$%s', $parameter->isVariadic() ? '...' : '', $parameter->getName())),
+					$argumentName === null ? sprintf(
+						'#%d %s',
+						$i + 1,
+						$parameterDescription
+					) : $parameterDescription,
 					$parameterType->describe($verbosityLevel),
 					$argumentValueType->describe($verbosityLevel)
 				))->build();
@@ -271,9 +276,10 @@ static function (Type $type): bool {
 			}
 
 			if ($this->nullsafeCheck->containsNullSafe($argumentValue)) {
+				$parameterDescription = sprintf('%s$%s', $parameter->isVariadic() ? '...' : '', $parameter->getName());
 				$errors[] = RuleErrorBuilder::message(sprintf(
 					$messages[8],
-					sprintf('#%d %s', $i + 1, sprintf('%s$%s', $parameter->isVariadic() ? '...' : '', $parameter->getName()))
+					$argumentName === null ? sprintf('#%d %s', $i + 1, $parameterDescription) : $parameterDescription
 				))->build();
 				continue;
 			}
@@ -285,9 +291,10 @@ static function (Type $type): bool {
 				continue;
 			}
 
+			$parameterDescription = sprintf('%s$%s', $parameter->isVariadic() ? '...' : '', $parameter->getName());
 			$errors[] = RuleErrorBuilder::message(sprintf(
 				$messages[8],
-				sprintf('#%d %s', $i + 1, sprintf('%s$%s', $parameter->isVariadic() ? '...' : '', $parameter->getName()))
+				$argumentName === null ? sprintf('#%d %s', $i + 1, $parameterDescription) : $parameterDescription
 			))->build();
 		}
 
diff --git a/tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php b/tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php
@@ -1640,6 +1640,22 @@ public function testNamedArguments(): void
 				'Unknown parameter $z in call to method NamedArgumentsMethod\Foo::doFoo().',
 				42,
 			],
+			[
+				'Parameter #1 $i of method NamedArgumentsMethod\Foo::doFoo() expects int, string given.',
+				49,
+			],
+			[
+				'Parameter $j of method NamedArgumentsMethod\Foo::doFoo() expects int, string given.',
+				55,
+			],
+			[
+				'Parameter $i of method NamedArgumentsMethod\Foo::doBaz() is passed by reference, so it expects variables only.',
+				70,
+			],
+			[
+				'Parameter $i of method NamedArgumentsMethod\Foo::doBaz() is passed by reference, so it expects variables only.',
+				71,
+			],
 		]);
 	}
 
diff --git a/tests/PHPStan/Rules/Methods/data/named-arguments.php b/tests/PHPStan/Rules/Methods/data/named-arguments.php
@@ -45,6 +45,30 @@ public function doBar(): void
 			3,
 			z: 4
 		);
+
+		$this->doFoo(
+			'foo',
+			j: 2,
+			k: 3
+		);
+
+		$this->doFoo(
+			1,
+			j: 'foo',
+			k: 3
+		);
+
+	}
+
+	public function doBaz(&$i): void
+	{
+
+	}
+
+	public function doLorem(?\stdClass $foo): void
+	{
+		$this->doBaz(i: 1);
+		$this->doBaz(i: $foo?->bar);
 	}
 
 }
