Rename "Callable\ParameterXxx" to "Callable\CallableParameterXxx"

Author: Kirill Nesmeyanov

resources/grammar/callable.pp2

@@ -8,7 +8,7 @@ CallableType -> {
 
     $parameters = isset($children[0]) && $children[0] instanceof Node\Stmt\Callable\ParametersListNode
         ? \array_shift($children)
-        : new Node\Stmt\Callable\ParametersListNode();
+        : new Node\Stmt\Callable\CallableParametersListNode();
 
     return new Node\Stmt\CallableTypeNode(
         name: $name,
@@ -24,7 +24,7 @@ CallableType -> {
   ;
 
 CallableParameters -> {
-    return new Node\Stmt\Callable\ParametersListNode($children);
+    return new Node\Stmt\Callable\CallableParametersListNode($children);
 }
   : CallableParameter() (::T_COMMA:: CallableParameter())* ::T_COMMA::?
   ;
@@ -91,7 +91,7 @@ VariadicCallableParameter -> {
   ;
 
 OutputCallableParameter -> {
-    $argument = new Node\Stmt\Callable\ParameterNode($children[0]);
+    $argument = new Node\Stmt\Callable\CallableParameterNode($children[0]);
 
     if (\count($children) !== 1) {
         $argument->output = true;

src/Node/Stmt/Callable/CallableParameterNode.php

@@ -0,0 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
+namespace TypeLang\Parser\Node\Stmt\Callable;
+
+class CallableParameterNode extends ParameterNode {}

src/Node/Stmt/Callable/CallableParametersListNode.php

@@ -0,0 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
+namespace TypeLang\Parser\Node\Stmt\Callable;
+
+class CallableParametersListNode extends ParametersListNode {}

src/Node/Stmt/Callable/ParameterNode.php

@@ -9,7 +9,10 @@
 use TypeLang\Parser\Node\Stmt\Attribute\AttributeGroupsListNode;
 use TypeLang\Parser\Node\Stmt\TypeStatement;
 
-final class ParameterNode extends Node implements \Stringable
+/**
+ * @deprecated Since 1.3, please use {@see CallableParameterNode} instead.
+ */
+class ParameterNode extends Node implements \Stringable
 {
     public function __construct(
         public ?TypeStatement $type = null,

src/Node/Stmt/Callable/ParametersListNode.php

@@ -8,5 +8,7 @@
 
 /**
  * @template-extends NodeList<ParameterNode>
+ *
+ * @deprecated Since 1.3, please use {@see CallableParametersListNode} instead.
  */
 class ParametersListNode extends NodeList {}

tests/Unit/Types/PhpStanTypesTest.php

@@ -433,12 +433,12 @@ public static function typesDataProvider(): iterable
             Stmt\CallableTypeNode
               Name(callable)
                 Identifier(callable)
-              Stmt\Callable\ParametersListNode
-                Stmt\Callable\ParameterNode(simple)
+              Stmt\Callable\CallableParametersListNode
+                Stmt\Callable\CallableParameterNode(simple)
                   Stmt\NamedTypeNode
                     Name(int)
                       Identifier(int)
-                Stmt\Callable\ParameterNode(simple)
+                Stmt\Callable\CallableParameterNode(simple)
                   Stmt\NamedTypeNode
                     Name(int)
                       Identifier(int)
@@ -450,12 +450,12 @@ public static function typesDataProvider(): iterable
             Stmt\CallableTypeNode
               Name(callable)
                 Identifier(callable)
-              Stmt\Callable\ParametersListNode
-                Stmt\Callable\ParameterNode(simple)
+              Stmt\Callable\CallableParametersListNode
+                Stmt\Callable\CallableParameterNode(simple)
                   Stmt\NamedTypeNode
                     Name(int)
                       Identifier(int)
-                Stmt\Callable\ParameterNode(optional)
+                Stmt\Callable\CallableParameterNode(optional)
                   Stmt\NamedTypeNode
                     Name(int)
                       Identifier(int)
@@ -467,13 +467,13 @@ public static function typesDataProvider(): iterable
             Stmt\CallableTypeNode
               Name(callable)
                 Identifier(callable)
-              Stmt\Callable\ParametersListNode
-                Stmt\Callable\ParameterNode(simple)
+              Stmt\Callable\CallableParametersListNode
+                Stmt\Callable\CallableParameterNode(simple)
                   Stmt\NamedTypeNode
                     Name(int)
                       Identifier(int)
                   Literal\VariableLiteralNode($foo)
-                Stmt\Callable\ParameterNode(simple)
+                Stmt\Callable\CallableParameterNode(simple)
                   Stmt\NamedTypeNode
                     Name(string)
                       Identifier(string)
@@ -486,8 +486,8 @@ public static function typesDataProvider(): iterable
             Stmt\CallableTypeNode
               Name(callable)
                 Identifier(callable)
-              Stmt\Callable\ParametersListNode
-                Stmt\Callable\ParameterNode(output)
+              Stmt\Callable\CallableParametersListNode
+                Stmt\Callable\CallableParameterNode(output)
                   Stmt\NamedTypeNode
                     Name(string)
                       Identifier(string)
@@ -500,8 +500,8 @@ public static function typesDataProvider(): iterable
             Stmt\CallableTypeNode
               Name(callable)
                 Identifier(callable)
-              Stmt\Callable\ParametersListNode
-                Stmt\Callable\ParameterNode(variadic)
+              Stmt\Callable\CallableParametersListNode
+                Stmt\Callable\CallableParameterNode(variadic)
                   Stmt\NamedTypeNode
                     Name(float)
                       Identifier(float)
@@ -516,8 +516,8 @@ public static function typesDataProvider(): iterable
             Stmt\CallableTypeNode
               Name(callable)
                 Identifier(callable)
-              Stmt\Callable\ParametersListNode
-                Stmt\Callable\ParameterNode(variadic)
+              Stmt\Callable\CallableParametersListNode
+                Stmt\Callable\CallableParameterNode(variadic)
                   Stmt\NamedTypeNode
                     Name(float)
                       Identifier(float)
@@ -531,12 +531,12 @@ public static function typesDataProvider(): iterable
             Stmt\CallableTypeNode
               FullQualifiedName(\Closure)
                 Identifier(Closure)
-              Stmt\Callable\ParametersListNode
-                Stmt\Callable\ParameterNode(simple)
+              Stmt\Callable\CallableParametersListNode
+                Stmt\Callable\CallableParameterNode(simple)
                   Stmt\NamedTypeNode
                     Name(int)
                       Identifier(int)
-                Stmt\Callable\ParameterNode(simple)
+                Stmt\Callable\CallableParameterNode(simple)
                   Stmt\NamedTypeNode
                     Name(int)
                       Identifier(int)

tests/Unit/Types/TernaryTypesTest.php

@@ -34,7 +34,7 @@ public static function typesDataProvider(): iterable
             Stmt\CallableTypeNode
               Name(foo)
                 Identifier(foo)
-              Stmt\Callable\ParametersListNode
+              Stmt\Callable\CallableParametersListNode
             STMT];
 
         yield '$this' => ['$this', <<<'STMT'