Remove null fields from json result and add hint fields

Author: Kirill Nesmeyanov

src/Node/NodeList.php

@@ -49,12 +49,6 @@ public function count(): int
 
     public function jsonSerialize(): array
     {
-        $items = [];
-
-        foreach ($this->items as $item) {
-            $items[] = $item->jsonSerialize();
-        }
-
-        return ['items' => $items];
+        return ['items' => $this->items];
     }
 }

src/Node/Stmt/Callable/ParameterNode.php

@@ -61,12 +61,12 @@ public function __toString(): string
 
     public function jsonSerialize(): array
     {
-        return [
+        return \array_filter([
             'name' => $this->name?->getValue(),
-            'type' => $this->type?->jsonSerialize(),
+            'type' => $this->type,
             'output' => $this->output,
             'variadic' => $this->variadic,
             'optional' => $this->optional,
-        ];
+        ], static fn (mixed $value): bool => $value !== null);
     }
 }

src/Node/Stmt/CallableTypeNode.php

@@ -17,11 +17,11 @@ public function __construct(
 
     public function jsonSerialize(): array
     {
-        return [
+        return \array_filter([
             'kind' => TypeKind::CALLABLE_KIND,
             'name' => $this->name->toString(),
-            'parameters' => $this->parameters->jsonSerialize(),
-            'type' => $this->type?->jsonSerialize(),
-        ];
+            'parameters' => $this->parameters,
+            'type' => $this->type,
+        ], static fn (mixed $value): bool => $value !== null);
     }
 }

src/Node/Stmt/ClassConstMaskNode.php

@@ -23,10 +23,10 @@ public function __construct(
 
     public function jsonSerialize(): array
     {
-        return [
+        return \array_filter([
             'kind' => TypeKind::CLASS_CONST_MASK_KIND,
             'class' => $this->class->toString(),
             'constant' => $this->constant?->toString(),
-        ];
+        ], static fn (mixed $value): bool => $value !== null);
     }
 }

src/Node/Stmt/ClassConstNode.php

@@ -19,10 +19,10 @@ public function __construct(Name $class, Identifier|string $constant)
 
     public function jsonSerialize(): array
     {
-        return [
+        return \array_filter([
             'kind' => TypeKind::CLASS_CONST_KIND,
             'class' => $this->class->toString(),
             'constant' => $this->constant?->toString(),
-        ];
+        ], static fn (mixed $value): bool => $value !== null);
     }
 }

src/Node/Stmt/Condition/Condition.php

@@ -18,8 +18,8 @@ public function jsonSerialize(): array
     {
         return [
             'kind' => ConditionKind::UNKNOWN,
-            'subject' => $this->subject->jsonSerialize(),
-            'target' => $this->target->jsonSerialize(),
+            'subject' => $this->subject,
+            'target' => $this->target,
         ];
     }
 }

src/Node/Stmt/ConstMaskNode.php

@@ -21,7 +21,7 @@ public function jsonSerialize(): array
     {
         return [
             'kind' => TypeKind::CONST_MASK_KIND,
-            'name' => $this->name->jsonSerialize(),
+            'name' => $this->name,
         ];
     }
 }

src/Node/Stmt/GenericTypeStmt.php

@@ -20,7 +20,7 @@ public function jsonSerialize(): array
     {
         return [
             ...parent::jsonSerialize(),
-            'type' => $this->type->jsonSerialize(),
+            'type' => $this->type,
         ];
     }
 

src/Node/Stmt/LogicalTypeNode.php

@@ -59,15 +59,9 @@ public function count(): int
 
     public function jsonSerialize(): array
     {
-        $items = [];
-
-        foreach ($this->statements as $statement) {
-            $items[] = $statement->jsonSerialize();
-        }
-
         return [
             ...parent::jsonSerialize(),
-            'items' => $items,
+            'items' => $this->statements,
         ];
     }
 

src/Node/Stmt/NamedTypeNode.php

@@ -26,25 +26,11 @@ public function __construct(
 
     public function jsonSerialize(): array
     {
-        $result = [
+        return \array_filter([
             'kind' => TypeKind::TYPE_KIND,
             'name' => $this->name->toString(),
-        ];
-
-        if ($this->arguments !== null) {
-            $arguments = [];
-
-            foreach ($this->arguments as $argument) {
-                $arguments[] = $argument->value->jsonSerialize();
-            }
-
-            $result['arguments'] = $arguments;
-        }
-
-        if ($this->fields !== null) {
-            $result['fields'] = $this->fields->jsonSerialize();
-        }
-
-        return $result;
+            'arguments' => $this->arguments,
+            'fields' => $this->fields,
+        ], static fn (mixed $value): bool => $value !== null);
     }
 }