Fixed static resolution

typhoon-php · Sep 21, 2023 · 900645a · 900645a
1 parent dc0ebe0
commit 900645a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/Reflector/PhpParserReflector.php b/src/Reflector/PhpParserReflector.php
@@ -490,7 +490,13 @@ private function reflectNativeType(?Node $node): ?Type\Type
         }
 
         if ($node instanceof Name) {
-            return types::object($this->nameContext->resolveNameAsClass($node->toCodeString()));
+            $resolvedName = $this->nameContext->resolveNameAsClass($node->toCodeString());
+
+            if ($node->toString() === 'static') {
+                return types::static($resolvedName);
+            }
+
+            return types::object($resolvedName);
         }
 
         throw new ReflectionException(sprintf('%s is not supported.', $node::class));

diff --git a/src/TypeResolver/ClassTemplateResolver.php b/src/TypeResolver/ClassTemplateResolver.php
@@ -215,7 +215,7 @@ public function visitNamedObject(Type\NamedObjectType $type): mixed
     public function visitStatic(Type\StaticType $type): mixed
     {
         /** @psalm-suppress ImpureFunctionCall */
-        return types::object($type->declaringClass, ...array_map(
+        return types::static($type->declaringClass, ...array_map(
             fn (Type\Type $type): Type\Type => $type->accept($this),
             $type->templateArguments,
         ));

diff --git a/src/TypeResolver/StaticResolver.php b/src/TypeResolver/StaticResolver.php
@@ -213,12 +213,10 @@ public function visitNamedObject(Type\NamedObjectType $type): mixed
     public function visitStatic(Type\StaticType $type): mixed
     {
         /** @psalm-suppress ImpureFunctionCall */
-        $templateArguments = array_map(
+        return types::object($this->class, ...array_map(
             fn (Type\Type $type): Type\Type => $type->accept($this),
             $type->templateArguments,
-        );
-
-        return types::object($this->class, ...$templateArguments);
+        ));
     }
 
     public function visitObject(Type\ObjectType $type): mixed