CallableType - fix parameter name

ondrejmirtes · ondrejmirtes · commit c8eaa31ff615 · 2020-11-16T00:02:59.000+01:00
diff --git a/src/PhpDoc/TypeNodeResolver.php b/src/PhpDoc/TypeNodeResolver.php
@@ -480,8 +480,12 @@ private function resolveCallableTypeNode(CallableTypeNode $typeNode, NameScope $
 		$parameters = array_map(
 			function (CallableTypeParameterNode $parameterNode) use ($nameScope, &$isVariadic): NativeParameterReflection {
 				$isVariadic = $isVariadic || $parameterNode->isVariadic;
+				$parameterName = $parameterNode->parameterName;
+				if (strpos($parameterName, '$') === 0) {
+					$parameterName = substr($parameterName, 1);
+				}
 				return new NativeParameterReflection(
-					$parameterNode->parameterName,
+					$parameterName,
 					$parameterNode->isOptional || $parameterNode->isVariadic,
 					$this->resolve($parameterNode->type, $nameScope),
 					$parameterNode->isReference ? PassedByReference::createCreatesNewVariable() : PassedByReference::createNo(),
diff --git a/tests/PHPStan/Rules/Functions/CallCallablesRuleTest.php b/tests/PHPStan/Rules/Functions/CallCallablesRuleTest.php
@@ -145,19 +145,19 @@ public function testNamedArguments(): void
 				14,
 			],
 			[
-				'Missing parameter $ (int) in call to callable callable(int, int): void.',
+				'Unknown parameter $i in call to callable callable(int, int): void.',
 				23,
 			],
 			[
 				'Missing parameter $ (int) in call to callable callable(int, int): void.',
 				23,
 			],
 			[
-				'Missing parameter $$i (int) in call to callable callable(int, int): void.',
-				24,
+				'Missing parameter $ (int) in call to callable callable(int, int): void.',
+				23,
 			],
 			[
-				'Missing parameter $$j (int) in call to callable callable(int, int): void.',
+				'Missing parameter $j (int) in call to callable callable(int, int): void.',
 				24,
 			],
 			[

Original file line number	Diff line number	Diff line change
`@@ -145,19 +145,19 @@ public function testNamedArguments(): void`
`145`	`145`	`14,`
`146`	`146`	`],`
`147`	`147`	`[`
`148`		`- 'Missing parameter $ (int) in call to callable callable(int, int): void.',`
	`148`	`+ 'Unknown parameter $i in call to callable callable(int, int): void.',`
`149`	`149`	`23,`
`150`	`150`	`],`
`151`	`151`	`[`
`152`	`152`	`'Missing parameter $ (int) in call to callable callable(int, int): void.',`
`153`	`153`	`23,`
`154`	`154`	`],`
`155`	`155`	`[`
`156`		`- 'Missing parameter $$i (int) in call to callable callable(int, int): void.',`
`157`		`- 24,`
	`156`	`+ 'Missing parameter $ (int) in call to callable callable(int, int): void.',`
	`157`	`+ 23,`
`158`	`158`	`],`
`159`	`159`	`[`
`160`		`- 'Missing parameter $$j (int) in call to callable callable(int, int): void.',`
	`160`	`+ 'Missing parameter $j (int) in call to callable callable(int, int): void.',`
`161`	`161`	`24,`
`162`	`162`	`],`
`163`	`163`	`[`