修复 static 类型的解析处理 (#590)

* 修复 static 类型的解析处理 * 修复 * 修复并增加测试
imiphp · Oct 17, 2023 · 3c293a9 · 3c293a9
1 parent 5d2eeb9
commit 3c293a9
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/src/Bean/ReflectionUtil.php b/src/Bean/ReflectionUtil.php
@@ -26,7 +26,7 @@ public static function getTypeComments(?\ReflectionType $type, ?string $classNam
                         $typeStr = '\\' . $className;
                     }
                 }
-                else
+                elseif ('static' !== $typeStr)
                 {
                     $typeStr = '\\' . $typeStr;
                 }
@@ -96,7 +96,7 @@ public static function getTypeCode(?\ReflectionType $type, ?string $className =
                         $typeStr = '\\' . $className;
                     }
                 }
-                else
+                elseif ('static' !== $typeStr)
                 {
                     $typeStr = '\\' . $typeStr;
                 }

diff --git a/tests/unit/Component/Tests/BeanTest.php b/tests/unit/Component/Tests/BeanTest.php
@@ -63,6 +63,17 @@ public function testGetTypeComments(): void
             CODE);
             $rf = new \ReflectionFunction($f);
             $this->assertEquals('string|int', ReflectionUtil::getTypeComments($rf->getReturnType()));
+
+            $c = Imi::eval(<<<'CODE'
+            return new class() {
+                public function test(): static
+                {
+                    return $this;
+                }
+            };
+            CODE);
+            $rf = new \ReflectionMethod($c, 'test');
+            $this->assertEquals('static', ReflectionUtil::getTypeComments($rf->getReturnType()));
         }
 
         // @phpstan-ignore-next-line
@@ -157,6 +168,17 @@ public function testGetTypeCode(): void
             CODE);
             $rf = new \ReflectionFunction($f);
             $this->assertEquals('string|int', ReflectionUtil::getTypeCode($rf->getReturnType()));
+
+            $c = Imi::eval(<<<'CODE'
+            return new class() {
+                public function test(): static
+                {
+                    return $this;
+                }
+            };
+            CODE);
+            $rf = new \ReflectionMethod($c, 'test');
+            $this->assertEquals('static', ReflectionUtil::getTypeCode($rf->getReturnType()));
         }
 
         // @phpstan-ignore-next-line