Fix native printer literals

php-type-language · Jan 11, 2025 · aab010d · aab010d
1 parent 9e3cf12
commit aab010d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/resources/aliases/phpstan.php b/resources/aliases/phpstan.php
@@ -43,7 +43,6 @@
     'non-empty-list' => 'array',
     // object
     'callable-object' => 'object',
-    '$this' => 'object',
     // callable
     'pure-callable' => 'callable',
     'pure-closure' => '\Closure',

diff --git a/resources/aliases/psalm.php b/resources/aliases/psalm.php
@@ -44,7 +44,6 @@
     'private-properties-of' => 'array',
     'properties-of' => 'array',
     // object
-    '$this' => 'object',
     'callable-object' => 'object',
     'stringable-object' => '\Stringable',
     // callable

diff --git a/src/NativeTypePrinter.php b/src/NativeTypePrinter.php
@@ -4,7 +4,12 @@
 
 namespace TypeLang\Printer;
 
+use TypeLang\Parser\Node\Literal\BoolLiteralNode;
+use TypeLang\Parser\Node\Literal\FloatLiteralNode;
+use TypeLang\Parser\Node\Literal\IntLiteralNode;
 use TypeLang\Parser\Node\Literal\LiteralNode;
+use TypeLang\Parser\Node\Literal\NullLiteralNode;
+use TypeLang\Parser\Node\Literal\StringLiteralNode;
 use TypeLang\Parser\Node\Literal\VariableLiteralNode;
 use TypeLang\Parser\Node\Stmt\CallableTypeNode;
 use TypeLang\Parser\Node\Stmt\ClassConstMaskNode;
@@ -226,15 +231,15 @@ protected function printNamedTypeNode(NamedTypeNode $node): string
     #[\Override]
     protected function printLiteralNode(LiteralNode $node): string
     {
-        if ($node instanceof VariableLiteralNode) {
-            if ($node->getValue() === 'this') {
-                return 'self';
-            }
-
-            return 'mixed';
-        }
-
-        return \get_debug_type($node->getRawValue());
+        return match (true) {
+            $node instanceof BoolLiteralNode => 'bool',
+            $node instanceof FloatLiteralNode => 'float',
+            $node instanceof IntLiteralNode => 'int',
+            $node instanceof NullLiteralNode => 'null',
+            $node instanceof StringLiteralNode => 'string',
+            $node instanceof VariableLiteralNode => $node->getValue() === 'this' ? 'self' : 'mixed',
+            default => \get_debug_type($node->getValue()),
+        };
     }
 
     #[\Override]