fix: handle interface generics

CuyZ · Apr 24, 2024 · 40e6fa3 · 40e6fa3
1 parent c5860f0
commit 40e6fa3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/Type/Parser/Lexer/Token/ClassNameToken.php b/src/Type/Parser/Lexer/Token/ClassNameToken.php
@@ -49,15 +49,15 @@ public function traverse(TokenStream $stream): Type
             return $constant;
         }
 
-        if ($this->reflection->isInterface()) {
-            return new InterfaceType($this->reflection->name);
-        }
-
         $templates = (new ClassTemplatesResolver())->resolveTemplateNamesFrom($this->reflection->name);
 
         $generics = $this->generics($stream, $this->reflection->name, $templates);
         $generics = $this->assignGenerics($this->reflection->name, $templates, $generics);
 
+        if ($this->reflection->isInterface()) {
+            return new InterfaceType($this->reflection->name, $generics);
+        }
+
         return new NativeClassType($this->reflection->name, $generics);
     }
 

diff --git a/tests/Functional/Type/Parser/LexingParserTest.php b/tests/Functional/Type/Parser/LexingParserTest.php
@@ -837,6 +837,12 @@ public static function parse_valid_types_returns_valid_result_data_provider(): i
             'type' => InterfaceType::class,
         ];
 
+        yield 'Interface name with one template' => [
+            'raw' => SomeInterfaceWithOneTemplate::class . '<string>',
+            'transformed' => SomeInterfaceWithOneTemplate::class . '<string>',
+            'type' => InterfaceType::class,
+        ];
+
         yield 'Class name with generic with one template' => [
             'raw' => SomeClassWithOneTemplate::class . '<int>',
             'transformed' => SomeClassWithOneTemplate::class . '<int>',
@@ -1621,3 +1627,8 @@ final class SomeClassWithTemplateOfArrayKey {}
  * @template TemplateB of object
  */
 final class SomeClassWithFirstTemplateWithoutTypeAndSecondTemplateWithType {}
+
+/**
+ * @template TemplateA
+ */
+interface SomeInterfaceWithOneTemplate {}