Address review: hook onto Param node, improve error messages

- Change rule to listen on Node\Param instead of Node\FunctionLike
- Replace "Cannot re-assign auto-global variable" with clearer
  "Superglobal variable $X cannot be used as a parameter."
- Use distinct identifiers: parameter.superglobal and parameter.this

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: 2 people

src/Rules/Functions/InvalidParameterNameRule.php

@@ -12,49 +12,48 @@
 use function sprintf;
 
 /**
- * @implements Rule<Node\FunctionLike>
+ * @implements Rule<Node\Param>
  */
 #[RegisteredRule(level: 0)]
 final class InvalidParameterNameRule implements Rule
 {
 
 	public function getNodeType(): string
 	{
-		return Node\FunctionLike::class;
+		return Node\Param::class;
 	}
 
 	public function processNode(Node $node, Scope $scope): array
 	{
-		$errors = [];
-
-		foreach ($node->getParams() as $param) {
-			if (!$param->var instanceof Node\Expr\Variable) {
-				continue;
-			}
+		if (!$node->var instanceof Node\Expr\Variable) {
+			return [];
+		}
 
-			if (!is_string($param->var->name)) {
-				continue;
-			}
+		if (!is_string($node->var->name)) {
+			return [];
+		}
 
-			$variableName = $param->var->name;
+		$variableName = $node->var->name;
 
-			if (in_array($variableName, Scope::SUPERGLOBAL_VARIABLES, true)) {
-				$errors[] = RuleErrorBuilder::message(sprintf('Cannot re-assign auto-global variable $%s.', $variableName))
-					->line($param->getStartLine())
-					->identifier('parameter.invalidExpr')
+		if (in_array($variableName, Scope::SUPERGLOBAL_VARIABLES, true)) {
+			return [
+				RuleErrorBuilder::message(sprintf('Superglobal variable $%s cannot be used as a parameter.', $variableName))
+					->identifier('parameter.superglobal')
 					->nonIgnorable()
-					->build();
-			} elseif ($variableName === 'this') {
-				$errors[] = RuleErrorBuilder::message('Cannot use $this as parameter.')
-					->line($param->getStartLine())
-					->identifier('parameter.invalidExpr')
-					->nonIgnorable()
-					->build();
-			}
+					->build(),
+			];
+		}
 
+		if ($variableName === 'this') {
+			return [
+				RuleErrorBuilder::message('Cannot use $this as parameter.')
+					->identifier('parameter.this')
+					->nonIgnorable()
+					->build(),
+			];
 		}
 
-		return $errors;
+		return [];
 	}
 
 }

tests/PHPStan/Rules/Functions/InvalidParameterNameRuleTest.php

@@ -20,39 +20,39 @@ public function testRule(): void
 	{
 		$this->analyse([__DIR__ . '/data/bug-14241.php'], [
 			[
-				'Cannot re-assign auto-global variable $_FILES.',
+				'Superglobal variable $_FILES cannot be used as a parameter.',
 				5,
 			],
 			[
-				'Cannot re-assign auto-global variable $_GET.',
+				'Superglobal variable $_GET cannot be used as a parameter.',
 				7,
 			],
 			[
-				'Cannot re-assign auto-global variable $_POST.',
+				'Superglobal variable $_POST cannot be used as a parameter.',
 				7,
 			],
 			[
-				'Cannot re-assign auto-global variable $_SERVER.',
+				'Superglobal variable $_SERVER cannot be used as a parameter.',
 				13,
 			],
 			[
-				'Cannot re-assign auto-global variable $_SESSION.',
+				'Superglobal variable $_SESSION cannot be used as a parameter.',
 				15,
 			],
 			[
-				'Cannot re-assign auto-global variable $_COOKIE.',
+				'Superglobal variable $_COOKIE cannot be used as a parameter.',
 				18,
 			],
 			[
-				'Cannot re-assign auto-global variable $_REQUEST.',
+				'Superglobal variable $_REQUEST cannot be used as a parameter.',
 				20,
 			],
 			[
-				'Cannot re-assign auto-global variable $_ENV.',
+				'Superglobal variable $_ENV cannot be used as a parameter.',
 				22,
 			],
 			[
-				'Cannot re-assign auto-global variable $GLOBALS.',
+				'Superglobal variable $GLOBALS cannot be used as a parameter.',
 				24,
 			],
 			[