FunctionCallParametersCheck - more precise lines

ondrejmirtes · ondrejmirtes · commit ba119bcc7b95 · 2020-11-18T17:22:41.000+01:00
diff --git a/src/Rules/FunctionCallParametersCheck.php b/src/Rules/FunctionCallParametersCheck.php
@@ -162,7 +162,7 @@ public function check(
 		}
 
 		if ($hasNamedArguments && !$this->phpVersion->supportsNamedArguments()) {
-			$errors[] = RuleErrorBuilder::message('Named arguments are supported only on PHP 8.0 and later.')->nonIgnorable()->build();
+			$errors[] = RuleErrorBuilder::message('Named arguments are supported only on PHP 8.0 and later.')->line($funcCall->getLine())->nonIgnorable()->build();
 		}
 
 		if (!$hasNamedArguments) {
@@ -183,20 +183,20 @@ public function check(
 						$invokedParametersCount === 1 ? $messages[0] : $messages[1],
 						$invokedParametersCount,
 						$functionParametersMinCount
-					))->build();
+					))->line($funcCall->getLine())->build();
 				} elseif ($functionParametersMaxCount === -1 && $invokedParametersCount < $functionParametersMinCount) {
 					$errors[] = RuleErrorBuilder::message(sprintf(
 						$invokedParametersCount === 1 ? $messages[2] : $messages[3],
 						$invokedParametersCount,
 						$functionParametersMinCount
-					))->build();
+					))->line($funcCall->getLine())->build();
 				} elseif ($functionParametersMaxCount !== -1) {
 					$errors[] = RuleErrorBuilder::message(sprintf(
 						$invokedParametersCount === 1 ? $messages[4] : $messages[5],
 						$invokedParametersCount,
 						$functionParametersMinCount,
 						$functionParametersMaxCount
-					))->build();
+					))->line($funcCall->getLine())->build();
 				}
 			}
 		}
@@ -206,10 +206,10 @@ public function check(
 			&& !$scope->isInFirstLevelStatement()
 			&& !$funcCall instanceof \PhpParser\Node\Expr\New_
 		) {
-			$errors[] = RuleErrorBuilder::message($messages[7])->build();
+			$errors[] = RuleErrorBuilder::message($messages[7])->line($funcCall->getLine())->build();
 		}
 
-		[$addedErrors, $argumentsWithParameters] = $this->processArguments($parametersAcceptor, $isBuiltin, $arguments, $hasNamedArguments, $messages[10], $messages[11]);
+		[$addedErrors, $argumentsWithParameters] = $this->processArguments($parametersAcceptor, $funcCall->getLine(), $isBuiltin, $arguments, $hasNamedArguments, $messages[10], $messages[11]);
 		foreach ($addedErrors as $error) {
 			$errors[] = $error;
 		}
@@ -301,7 +301,7 @@ static function (Type $type): bool {
 					continue;
 				}
 
-				$errors[] = RuleErrorBuilder::message(sprintf($messages[9], $name))->build();
+				$errors[] = RuleErrorBuilder::message(sprintf($messages[9], $name))->line($funcCall->getLine())->build();
 			}
 		}
 
@@ -318,6 +318,7 @@ static function (Type $type): bool {
 	 */
 	private function processArguments(
 		ParametersAcceptor $parametersAcceptor,
+		int $line,
 		bool $isBuiltin,
 		array $arguments,
 		bool $hasNamedArguments,
@@ -405,7 +406,7 @@ private function processArguments(
 					continue;
 				}
 
-				$errors[] = RuleErrorBuilder::message(sprintf($missingParameterMessage, sprintf('%s (%s)', $parameter->getName(), $parameter->getType()->describe(VerbosityLevel::typeOnly()))))->build();
+				$errors[] = RuleErrorBuilder::message(sprintf($missingParameterMessage, sprintf('%s (%s)', $parameter->getName(), $parameter->getType()->describe(VerbosityLevel::typeOnly()))))->line($line)->build();
 			}
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ public function check(`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`if ($hasNamedArguments && !$this->phpVersion->supportsNamedArguments()) {`
`165`		`- $errors[] = RuleErrorBuilder::message('Named arguments are supported only on PHP 8.0 and later.')->nonIgnorable()->build();`
	`165`	`+ $errors[] = RuleErrorBuilder::message('Named arguments are supported only on PHP 8.0 and later.')->line($funcCall->getLine())->nonIgnorable()->build();`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`if (!$hasNamedArguments) {`
`@@ -183,20 +183,20 @@ public function check(`
`183`	`183`	`$invokedParametersCount === 1 ? $messages[0] : $messages[1],`
`184`	`184`	`$invokedParametersCount,`
`185`	`185`	`$functionParametersMinCount`
`186`		`- ))->build();`
	`186`	`+ ))->line($funcCall->getLine())->build();`
`187`	`187`	`} elseif ($functionParametersMaxCount === -1 && $invokedParametersCount < $functionParametersMinCount) {`
`188`	`188`	`$errors[] = RuleErrorBuilder::message(sprintf(`
`189`	`189`	`$invokedParametersCount === 1 ? $messages[2] : $messages[3],`
`190`	`190`	`$invokedParametersCount,`
`191`	`191`	`$functionParametersMinCount`
`192`		`- ))->build();`
	`192`	`+ ))->line($funcCall->getLine())->build();`
`193`	`193`	`} elseif ($functionParametersMaxCount !== -1) {`
`194`	`194`	`$errors[] = RuleErrorBuilder::message(sprintf(`
`195`	`195`	`$invokedParametersCount === 1 ? $messages[4] : $messages[5],`
`196`	`196`	`$invokedParametersCount,`
`197`	`197`	`$functionParametersMinCount,`
`198`	`198`	`$functionParametersMaxCount`
`199`		`- ))->build();`
	`199`	`+ ))->line($funcCall->getLine())->build();`
`200`	`200`	`}`
`201`	`201`	`}`
`202`	`202`	`}`
`@@ -206,10 +206,10 @@ public function check(`
`206`	`206`	`&& !$scope->isInFirstLevelStatement()`
`207`	`207`	`&& !$funcCall instanceof \PhpParser\Node\Expr\New_`
`208`	`208`	`) {`
`209`		`- $errors[] = RuleErrorBuilder::message($messages[7])->build();`
	`209`	`+ $errors[] = RuleErrorBuilder::message($messages[7])->line($funcCall->getLine())->build();`
`210`	`210`	`}`
`211`	`211`
`212`		`- [$addedErrors, $argumentsWithParameters] = $this->processArguments($parametersAcceptor, $isBuiltin, $arguments, $hasNamedArguments, $messages[10], $messages[11]);`
	`212`	`+ [$addedErrors, $argumentsWithParameters] = $this->processArguments($parametersAcceptor, $funcCall->getLine(), $isBuiltin, $arguments, $hasNamedArguments, $messages[10], $messages[11]);`
`213`	`213`	`foreach ($addedErrors as $error) {`
`214`	`214`	`$errors[] = $error;`
`215`	`215`	`}`
`@@ -301,7 +301,7 @@ static function (Type $type): bool {`
`301`	`301`	`continue;`
`302`	`302`	`}`
`303`	`303`
`304`		`- $errors[] = RuleErrorBuilder::message(sprintf($messages[9], $name))->build();`
	`304`	`+ $errors[] = RuleErrorBuilder::message(sprintf($messages[9], $name))->line($funcCall->getLine())->build();`
`305`	`305`	`}`
`306`	`306`	`}`
`307`	`307`
`@@ -318,6 +318,7 @@ static function (Type $type): bool {`
`318`	`318`	`*/`
`319`	`319`	`private function processArguments(`
`320`	`320`	`ParametersAcceptor $parametersAcceptor,`
	`321`	`+ int $line,`
`321`	`322`	`bool $isBuiltin,`
`322`	`323`	`array $arguments,`
`323`	`324`	`bool $hasNamedArguments,`
`@@ -405,7 +406,7 @@ private function processArguments(`
`405`	`406`	`continue;`
`406`	`407`	`}`
`407`	`408`
`408`		`- $errors[] = RuleErrorBuilder::message(sprintf($missingParameterMessage, sprintf('%s (%s)', $parameter->getName(), $parameter->getType()->describe(VerbosityLevel::typeOnly()))))->build();`
	`409`	`+ $errors[] = RuleErrorBuilder::message(sprintf($missingParameterMessage, sprintf('%s (%s)', $parameter->getName(), $parameter->getType()->describe(VerbosityLevel::typeOnly()))))->line($line)->build();`
`409`	`410`	`}`
`410`	`411`	`}`
`411`	`412`