Fix TypeOffsetAccessNode serialization logic and a little more improvements

SerafimArts · SerafimArts · commit 39c25334bece · 2025-03-07T00:43:17.000+03:00
diff --git a/resources/.meta-storm.xml b/resources/.meta-storm.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<meta-storm xmlns="meta-storm">
+    <definitions>
+
+        <classConstructor class="\TypeLang\Parser\ParserInterface"
+                          argument="1">
+            <languageInjection language="InjectablePHP" />
+        </classConstructor>
+
+        <classConstructor class="\TypeLang\Parser\Parser"
+                          argument="1">
+            <languageInjection language="InjectablePHP" />
+        </classConstructor>
+
+        <classConstructor class="\TypeLang\Parser\InMemoryCachedParser"
+                          argument="1">
+            <languageInjection language="InjectablePHP" />
+        </classConstructor>
+
+    </definitions>
+</meta-storm>
diff --git a/src/Builder.php b/src/Builder.php
diff --git a/src/InMemoryCachedParser.php b/src/InMemoryCachedParser.php
@@ -4,7 +4,6 @@
 
 namespace TypeLang\Parser;
 
-use JetBrains\PhpStorm\Language;
 use Phplrt\Contracts\Source\SourceExceptionInterface;
 use Phplrt\Contracts\Source\SourceFactoryInterface;
 use Phplrt\Source\SourceFactory;
@@ -28,7 +27,7 @@ public function __construct(
      * @throws SourceExceptionInterface
      * @throws \Throwable
      */
-    public function parse(#[Language('PHP')] mixed $source): TypeStatement
+    public function parse(mixed $source): TypeStatement
     {
         $instance = $this->sources->create($source);
 
diff --git a/src/Node/Stmt/GenericTypeNode.php b/src/Node/Stmt/GenericTypeNode.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace TypeLang\Parser\Node\Stmt;
+
+/**
+ * @template T of TypeStatement = TypeStatement
+ * @template-extends GenericTypeStmt<T>
+ */
+abstract class GenericTypeNode extends GenericTypeStmt {}
diff --git a/src/Node/Stmt/GenericTypeStmt.php b/src/Node/Stmt/GenericTypeStmt.php
@@ -6,6 +6,8 @@
 
 /**
  * @template T of TypeStatement = TypeStatement
+ *
+ * @deprecated Since 1.4.3, please use {@see GenericTypeNode} instead.
  */
 abstract class GenericTypeStmt extends TypeStatement
 {
@@ -15,30 +17,4 @@ abstract class GenericTypeStmt extends TypeStatement
     public function __construct(
         public TypeStatement $type,
     ) {}
-
-    /**
-     * @return array{int<0, max>, T}
-     */
-    public function __serialize(): array
-    {
-        return [$this->offset, $this->type];
-    }
-
-    /**
-     * @param array{0?: int<0, max>, 1?: T} $data
-     *
-     * @throws \UnexpectedValueException
-     */
-    public function __unserialize(array $data): void
-    {
-        $this->offset = $data[0] ?? throw new \UnexpectedValueException(\sprintf(
-            'Unable to unserialize %s offset',
-            static::class,
-        ));
-
-        $this->type = $data[1] ?? throw new \UnexpectedValueException(\sprintf(
-            'Unable to unserialize %s type',
-            static::class,
-        ));
-    }
 }
diff --git a/src/Node/Stmt/NullableTypeNode.php b/src/Node/Stmt/NullableTypeNode.php
@@ -6,6 +6,6 @@
 
 /**
  * @template T of TypeStatement = TypeStatement
- * @template-extends GenericTypeStmt<TypeStatement>
+ * @template-extends GenericTypeNode<TypeStatement>
  */
-class NullableTypeNode extends GenericTypeStmt {}
+class NullableTypeNode extends GenericTypeNode {}
diff --git a/src/Node/Stmt/TypeOffsetAccessNode.php b/src/Node/Stmt/TypeOffsetAccessNode.php
@@ -6,9 +6,9 @@
 
 /**
  * @template T of TypeStatement = TypeStatement
- * @template-extends GenericTypeStmt<T>
+ * @template-extends GenericTypeNode<T>
  */
-class TypeOffsetAccessNode extends GenericTypeStmt
+class TypeOffsetAccessNode extends GenericTypeNode
 {
     public function __construct(
         TypeStatement $type,
diff --git a/src/Node/Stmt/TypesListNode.php b/src/Node/Stmt/TypesListNode.php
@@ -6,6 +6,6 @@
 
 /**
  * @template T of TypeStatement = TypeStatement
- * @template-extends GenericTypeStmt<T>
+ * @template-extends GenericTypeNode<T>
  */
-class TypesListNode extends GenericTypeStmt {}
+class TypesListNode extends GenericTypeNode {}
diff --git a/src/Parser.php b/src/Parser.php
@@ -4,7 +4,6 @@
 
 namespace TypeLang\Parser;
 
-use JetBrains\PhpStorm\Language;
 use Phplrt\Contracts\Lexer\LexerInterface;
 use Phplrt\Contracts\Lexer\TokenInterface;
 use Phplrt\Contracts\Parser\ParserRuntimeExceptionInterface;
@@ -128,11 +127,41 @@ public function __construct(
         $this->stringPool = new \WeakMap();
         $this->integerPool = new \WeakMap();
 
-        $this->builder = new Builder($grammar['reducers']);
+        $this->builder = $this->createBuilder($grammar['reducers']);
         $this->lexer = $this->createLexer($grammar);
         $this->parser = $this->createParser($this->lexer, $grammar);
     }
 
+    /**
+     * @param array<int<0, max>|non-empty-string, callable(Context, mixed):mixed> $reducers
+     */
+    private function createBuilder(array $reducers): BuilderInterface
+    {
+        return new class($reducers) implements BuilderInterface {
+            /**
+             * @param array<int<0, max>|non-empty-string, callable(Context, mixed):mixed> $reducers
+             */
+            public function __construct(
+                private readonly array $reducers,
+            ) {}
+
+            public function build(Context $context, mixed $result): mixed
+            {
+                if (!isset($this->reducers[$context->state])) {
+                    return $result;
+                }
+
+                $result = ($this->reducers[$context->state])($context, $result);
+
+                if ($result instanceof Node && $result->offset === 0) {
+                    $result->offset = $context->lastProcessedToken->getOffset();
+                }
+
+                return $result;
+            }
+        };
+    }
+
     /**
      * @phpstan-param GrammarConfigArray $grammar
      *
@@ -164,7 +193,7 @@ private function createLexer(array $grammar): Lexer
         );
     }
 
-    public function parse(#[Language('PHP')] mixed $source): TypeStatement
+    public function parse(mixed $source): TypeStatement
     {
         $this->lastProcessedTokenOffset = 0;
 
diff --git a/src/ParserInterface.php b/src/ParserInterface.php
@@ -4,7 +4,6 @@
 
 namespace TypeLang\Parser;
 
-use JetBrains\PhpStorm\Language;
 use TypeLang\Parser\Exception\ParserExceptionInterface;
 use TypeLang\Parser\Node\Stmt\TypeStatement;
 
@@ -19,5 +18,5 @@ interface ParserInterface
      * @throws ParserExceptionInterface in case of parsing exception occurs
      * @throws \Throwable in case of internal error occurs
      */
-    public function parse(#[Language('PHP')] mixed $source): TypeStatement;
+    public function parse(mixed $source): TypeStatement;
 }
diff --git a/tests/Unit/Serialization/PhpSerializationTest/typelang_parser_node_stmt_callable_callableparameternode.a03c8f17.txt b/tests/Unit/Serialization/PhpSerializationTest/typelang_parser_node_stmt_callable_callableparameternode.a03c8f17.txt
@@ -0,0 +1 @@
+O:56:"TypeLang\Parser\Node\Stmt\Callable\CallableParameterNode":7:{s:6:"offset";i:0;s:4:"type";O:39:"TypeLang\Parser\Node\Stmt\NamedTypeNode":4:{s:6:"offset";i:0;s:4:"name";O:25:"TypeLang\Parser\Node\Name":2:{i:0;i:0;i:1;a:1:{i:0;O:31:"TypeLang\Parser\Node\Identifier":2:{i:0;i:0;i:1;s:3:"int";}}}s:9:"arguments";N;s:6:"fields";N;}s:4:"name";N;s:6:"output";b:0;s:8:"variadic";b:0;s:8:"optional";b:0;s:10:"attributes";N;}
diff --git a/tests/Unit/Serialization/PhpSerializationTest/typelang_parser_node_stmt_callable_callableparameternode.b7b27013.txt b/tests/Unit/Serialization/PhpSerializationTest/typelang_parser_node_stmt_callable_callableparameternode.b7b27013.txt
diff --git a/tests/Unit/Serialization/PhpSerializationTest/typelang_parser_node_stmt_callable_callableparameterslistnode.24c6e8a4.txt b/tests/Unit/Serialization/PhpSerializationTest/typelang_parser_node_stmt_callable_callableparameterslistnode.24c6e8a4.txt
@@ -0,0 +1 @@
+O:61:"TypeLang\Parser\Node\Stmt\Callable\CallableParametersListNode":2:{s:6:"offset";i:0;s:5:"items";a:1:{i:0;O:56:"TypeLang\Parser\Node\Stmt\Callable\CallableParameterNode":7:{s:6:"offset";i:0;s:4:"type";O:39:"TypeLang\Parser\Node\Stmt\NamedTypeNode":4:{s:6:"offset";i:0;s:4:"name";O:25:"TypeLang\Parser\Node\Name":2:{i:0;i:0;i:1;a:1:{i:0;O:31:"TypeLang\Parser\Node\Identifier":2:{i:0;i:0;i:1;s:3:"int";}}}s:9:"arguments";N;s:6:"fields";N;}s:4:"name";N;s:6:"output";b:0;s:8:"variadic";b:0;s:8:"optional";b:0;s:10:"attributes";N;}}}
diff --git a/tests/Unit/Serialization/PhpSerializationTest/typelang_parser_node_stmt_callable_parameternode.e3e93774.txt b/tests/Unit/Serialization/PhpSerializationTest/typelang_parser_node_stmt_callable_parameternode.e3e93774.txt
diff --git a/tests/Unit/Serialization/PhpSerializationTest/typelang_parser_node_stmt_callable_parameterslistnode.86015acc.txt b/tests/Unit/Serialization/PhpSerializationTest/typelang_parser_node_stmt_callable_parameterslistnode.86015acc.txt
@@ -1 +1 @@
-O:53:"TypeLang\Parser\Node\Stmt\Callable\ParametersListNode":2:{s:6:"offset";i:0;s:5:"items";a:1:{i:0;O:48:"TypeLang\Parser\Node\Stmt\Callable\ParameterNode":7:{s:6:"offset";i:0;s:4:"type";O:39:"TypeLang\Parser\Node\Stmt\NamedTypeNode":4:{s:6:"offset";i:0;s:4:"name";O:25:"TypeLang\Parser\Node\Name":2:{i:0;i:0;i:1;a:1:{i:0;O:31:"TypeLang\Parser\Node\Identifier":2:{i:0;i:0;i:1;s:3:"int";}}}s:9:"arguments";N;s:6:"fields";N;}s:4:"name";N;s:6:"output";b:0;s:8:"variadic";b:0;s:8:"optional";b:0;s:10:"attributes";N;}}}
+O:53:"TypeLang\Parser\Node\Stmt\Callable\ParametersListNode":2:{s:6:"offset";i:0;s:5:"items";a:1:{i:0;O:56:"TypeLang\Parser\Node\Stmt\Callable\CallableParameterNode":7:{s:6:"offset";i:0;s:4:"type";O:39:"TypeLang\Parser\Node\Stmt\NamedTypeNode":4:{s:6:"offset";i:0;s:4:"name";O:25:"TypeLang\Parser\Node\Name":2:{i:0;i:0;i:1;a:1:{i:0;O:31:"TypeLang\Parser\Node\Identifier":2:{i:0;i:0;i:1;s:3:"int";}}}s:9:"arguments";N;s:6:"fields";N;}s:4:"name";N;s:6:"output";b:0;s:8:"variadic";b:0;s:8:"optional";b:0;s:10:"attributes";N;}}}
diff --git a/tests/Unit/Serialization/PhpSerializationTest/typelang_parser_node_stmt_callabletypenode.26818717.txt b/tests/Unit/Serialization/PhpSerializationTest/typelang_parser_node_stmt_callabletypenode.26818717.txt
@@ -1 +1 @@
-O:42:"TypeLang\Parser\Node\Stmt\CallableTypeNode":4:{s:6:"offset";i:0;s:4:"name";O:25:"TypeLang\Parser\Node\Name":2:{i:0;i:0;i:1;a:1:{i:0;O:31:"TypeLang\Parser\Node\Identifier":2:{i:0;i:0;i:1;s:3:"foo";}}}s:10:"parameters";O:53:"TypeLang\Parser\Node\Stmt\Callable\ParametersListNode":2:{s:6:"offset";i:0;s:5:"items";a:1:{i:0;O:48:"TypeLang\Parser\Node\Stmt\Callable\ParameterNode":7:{s:6:"offset";i:0;s:4:"type";O:39:"TypeLang\Parser\Node\Stmt\NamedTypeNode":4:{s:6:"offset";i:0;s:4:"name";O:25:"TypeLang\Parser\Node\Name":2:{i:0;i:0;i:1;a:1:{i:0;O:31:"TypeLang\Parser\Node\Identifier":2:{i:0;i:0;i:1;s:3:"int";}}}s:9:"arguments";N;s:6:"fields";N;}s:4:"name";N;s:6:"output";b:0;s:8:"variadic";b:0;s:8:"optional";b:0;s:10:"attributes";N;}}}s:4:"type";N;}
+O:42:"TypeLang\Parser\Node\Stmt\CallableTypeNode":4:{s:6:"offset";i:0;s:4:"name";O:25:"TypeLang\Parser\Node\Name":2:{i:0;i:0;i:1;a:1:{i:0;O:31:"TypeLang\Parser\Node\Identifier":2:{i:0;i:0;i:1;s:3:"foo";}}}s:10:"parameters";O:61:"TypeLang\Parser\Node\Stmt\Callable\CallableParametersListNode":2:{s:6:"offset";i:0;s:5:"items";a:1:{i:0;O:56:"TypeLang\Parser\Node\Stmt\Callable\CallableParameterNode":7:{s:6:"offset";i:0;s:4:"type";O:39:"TypeLang\Parser\Node\Stmt\NamedTypeNode":4:{s:6:"offset";i:0;s:4:"name";O:25:"TypeLang\Parser\Node\Name":2:{i:0;i:0;i:1;a:1:{i:0;O:31:"TypeLang\Parser\Node\Identifier":2:{i:0;i:0;i:1;s:3:"int";}}}s:9:"arguments";N;s:6:"fields";N;}s:4:"name";N;s:6:"output";b:0;s:8:"variadic";b:0;s:8:"optional";b:0;s:10:"attributes";N;}}}s:4:"type";N;}
diff --git a/tests/Unit/Serialization/PhpSerializationTest/typelang_parser_node_stmt_callabletypenode.9c6b215b.txt b/tests/Unit/Serialization/PhpSerializationTest/typelang_parser_node_stmt_callabletypenode.9c6b215b.txt
@@ -1 +1 @@
-O:42:"TypeLang\Parser\Node\Stmt\CallableTypeNode":4:{s:6:"offset";i:0;s:4:"name";O:25:"TypeLang\Parser\Node\Name":2:{i:0;i:0;i:1;a:1:{i:0;O:31:"TypeLang\Parser\Node\Identifier":2:{i:0;i:0;i:1;s:3:"foo";}}}s:10:"parameters";O:53:"TypeLang\Parser\Node\Stmt\Callable\ParametersListNode":2:{s:6:"offset";i:0;s:5:"items";a:1:{i:0;O:48:"TypeLang\Parser\Node\Stmt\Callable\ParameterNode":7:{s:6:"offset";i:0;s:4:"type";O:39:"TypeLang\Parser\Node\Stmt\NamedTypeNode":4:{s:6:"offset";i:0;s:4:"name";O:25:"TypeLang\Parser\Node\Name":2:{i:0;i:0;i:1;a:1:{i:0;O:31:"TypeLang\Parser\Node\Identifier":2:{i:0;i:0;i:1;s:3:"int";}}}s:9:"arguments";N;s:6:"fields";N;}s:4:"name";N;s:6:"output";b:0;s:8:"variadic";b:0;s:8:"optional";b:0;s:10:"attributes";N;}}}s:4:"type";O:39:"TypeLang\Parser\Node\Stmt\NamedTypeNode":4:{s:6:"offset";i:0;s:4:"name";O:25:"TypeLang\Parser\Node\Name":2:{i:0;i:0;i:1;a:1:{i:0;O:31:"TypeLang\Parser\Node\Identifier":2:{i:0;i:0;i:1;s:4:"void";}}}s:9:"arguments";N;s:6:"fields";N;}}
+O:42:"TypeLang\Parser\Node\Stmt\CallableTypeNode":4:{s:6:"offset";i:0;s:4:"name";O:25:"TypeLang\Parser\Node\Name":2:{i:0;i:0;i:1;a:1:{i:0;O:31:"TypeLang\Parser\Node\Identifier":2:{i:0;i:0;i:1;s:3:"foo";}}}s:10:"parameters";O:61:"TypeLang\Parser\Node\Stmt\Callable\CallableParametersListNode":2:{s:6:"offset";i:0;s:5:"items";a:1:{i:0;O:56:"TypeLang\Parser\Node\Stmt\Callable\CallableParameterNode":7:{s:6:"offset";i:0;s:4:"type";O:39:"TypeLang\Parser\Node\Stmt\NamedTypeNode":4:{s:6:"offset";i:0;s:4:"name";O:25:"TypeLang\Parser\Node\Name":2:{i:0;i:0;i:1;a:1:{i:0;O:31:"TypeLang\Parser\Node\Identifier":2:{i:0;i:0;i:1;s:3:"int";}}}s:9:"arguments";N;s:6:"fields";N;}s:4:"name";N;s:6:"output";b:0;s:8:"variadic";b:0;s:8:"optional";b:0;s:10:"attributes";N;}}}s:4:"type";O:39:"TypeLang\Parser\Node\Stmt\NamedTypeNode":4:{s:6:"offset";i:0;s:4:"name";O:25:"TypeLang\Parser\Node\Name":2:{i:0;i:0;i:1;a:1:{i:0;O:31:"TypeLang\Parser\Node\Identifier":2:{i:0;i:0;i:1;s:4:"void";}}}s:9:"arguments";N;s:6:"fields";N;}}
diff --git a/tests/Unit/Serialization/PhpSerializationTest/typelang_parser_node_stmt_nullabletypenode.1c482116.txt b/tests/Unit/Serialization/PhpSerializationTest/typelang_parser_node_stmt_nullabletypenode.1c482116.txt
@@ -1 +1 @@
-O:42:"TypeLang\Parser\Node\Stmt\NullableTypeNode":2:{i:0;i:0;i:1;O:39:"TypeLang\Parser\Node\Stmt\NamedTypeNode":4:{s:6:"offset";i:0;s:4:"name";O:25:"TypeLang\Parser\Node\Name":2:{i:0;i:0;i:1;a:1:{i:0;O:31:"TypeLang\Parser\Node\Identifier":2:{i:0;i:0;i:1;s:3:"int";}}}s:9:"arguments";N;s:6:"fields";N;}}
+O:42:"TypeLang\Parser\Node\Stmt\NullableTypeNode":2:{s:6:"offset";i:0;s:4:"type";O:39:"TypeLang\Parser\Node\Stmt\NamedTypeNode":4:{s:6:"offset";i:0;s:4:"name";O:25:"TypeLang\Parser\Node\Name":2:{i:0;i:0;i:1;a:1:{i:0;O:31:"TypeLang\Parser\Node\Identifier":2:{i:0;i:0;i:1;s:3:"int";}}}s:9:"arguments";N;s:6:"fields";N;}}
diff --git a/tests/Unit/Serialization/PhpSerializationTest/typelang_parser_node_stmt_typeoffsetaccessnode.15813ff4.txt b/tests/Unit/Serialization/PhpSerializationTest/typelang_parser_node_stmt_typeoffsetaccessnode.15813ff4.txt
@@ -0,0 +1 @@
+O:46:"TypeLang\Parser\Node\Stmt\TypeOffsetAccessNode":3:{s:6:"offset";i:0;s:4:"type";O:39:"TypeLang\Parser\Node\Stmt\NamedTypeNode":4:{s:6:"offset";i:0;s:4:"name";O:25:"TypeLang\Parser\Node\Name":2:{i:0;i:0;i:1;a:1:{i:0;O:31:"TypeLang\Parser\Node\Identifier":2:{i:0;i:0;i:1;s:5:"array";}}}s:9:"arguments";N;s:6:"fields";N;}s:6:"access";O:39:"TypeLang\Parser\Node\Stmt\NamedTypeNode":4:{s:6:"offset";i:0;s:4:"name";O:25:"TypeLang\Parser\Node\Name":2:{i:0;i:0;i:1;a:1:{i:0;O:31:"TypeLang\Parser\Node\Identifier":2:{i:0;i:0;i:1;s:5:"mixed";}}}s:9:"arguments";N;s:6:"fields";N;}}
diff --git a/tests/Unit/Serialization/PhpSerializationTest/typelang_parser_node_stmt_typeslistnode.381036f3.txt b/tests/Unit/Serialization/PhpSerializationTest/typelang_parser_node_stmt_typeslistnode.381036f3.txt
@@ -1 +1 @@
-O:39:"TypeLang\Parser\Node\Stmt\TypesListNode":2:{i:0;i:0;i:1;O:39:"TypeLang\Parser\Node\Stmt\NamedTypeNode":4:{s:6:"offset";i:0;s:4:"name";O:25:"TypeLang\Parser\Node\Name":2:{i:0;i:0;i:1;a:1:{i:0;O:31:"TypeLang\Parser\Node\Identifier":2:{i:0;i:0;i:1;s:3:"int";}}}s:9:"arguments";N;s:6:"fields";N;}}
+O:39:"TypeLang\Parser\Node\Stmt\TypesListNode":2:{s:6:"offset";i:0;s:4:"type";O:39:"TypeLang\Parser\Node\Stmt\NamedTypeNode":4:{s:6:"offset";i:0;s:4:"name";O:25:"TypeLang\Parser\Node\Name":2:{i:0;i:0;i:1;a:1:{i:0;O:31:"TypeLang\Parser\Node\Identifier":2:{i:0;i:0;i:1;s:3:"int";}}}s:9:"arguments";N;s:6:"fields";N;}}
diff --git a/tests/Unit/Serialization/SerializationTestCase.php b/tests/Unit/Serialization/SerializationTestCase.php
@@ -14,6 +14,8 @@
 use TypeLang\Parser\Node\Literal\StringLiteralNode;
 use TypeLang\Parser\Node\Literal\VariableLiteralNode;
 use TypeLang\Parser\Node\Name;
+use TypeLang\Parser\Node\Stmt\Callable\CallableParameterNode;
+use TypeLang\Parser\Node\Stmt\Callable\CallableParametersListNode;
 use TypeLang\Parser\Node\Stmt\Callable\ParameterNode;
 use TypeLang\Parser\Node\Stmt\Callable\ParametersListNode;
 use TypeLang\Parser\Node\Stmt\CallableTypeNode;
@@ -33,6 +35,7 @@
 use TypeLang\Parser\Node\Stmt\Template\TemplateArgumentNode;
 use TypeLang\Parser\Node\Stmt\Template\TemplateArgumentsListNode;
 use TypeLang\Parser\Node\Stmt\TernaryConditionNode;
+use TypeLang\Parser\Node\Stmt\TypeOffsetAccessNode;
 use TypeLang\Parser\Node\Stmt\TypesListNode;
 use TypeLang\Parser\Node\Stmt\UnionTypeNode;
 use TypeLang\Parser\Tests\Unit\TestCase;
@@ -266,24 +269,48 @@ class: new Name('Example\Class\Name'),
             ),
         ];
 
+        yield self::className(TypeOffsetAccessNode::class) => [
+            new TypeOffsetAccessNode(
+                type: new NamedTypeNode('array'),
+                access: new NamedTypeNode('mixed')
+            ),
+        ];
+
         // Statements :: Callable
         yield self::className(ParameterNode::class) => [$param = new ParameterNode(
             type: new NamedTypeNode(new Name('int')),
             name: new VariableLiteralNode('$test'),
-            output: true,
+            output: false,
             variadic: true,
-            optional: true,
+            optional: false,
+        )];
+
+        yield self::className(CallableParameterNode::class) => [$param = new CallableParameterNode(
+            type: new NamedTypeNode(new Name('int')),
+            name: new VariableLiteralNode('$test'),
+            output: false,
+            variadic: true,
+            optional: false,
         )];
 
         yield self::className(ParameterNode::class)
             . ' without name' => [$param = new ParameterNode(
                 type: new NamedTypeNode(new Name('int')),
             )];
 
+        yield self::className(CallableParameterNode::class)
+            . ' without name' => [$param = new CallableParameterNode(
+                type: new NamedTypeNode(new Name('int')),
+            )];
+
         yield self::className(ParametersListNode::class) => [$paramList = new ParametersListNode(
             items: [$param],
         )];
 
+        yield self::className(CallableParametersListNode::class) => [$paramList = new CallableParametersListNode(
+            items: [$param],
+        )];
+
         yield self::className(CallableTypeNode::class) => [new CallableTypeNode(
             name: new Name('foo'),
             parameters: $paramList,
