update: 修复注解类被跳过问题

imiphp · Oct 30, 2023 · e0eea3e · e0eea3e
1 parent 7268758
commit e0eea3e
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 3 deletions.
diff --git a/src/Visitor/RewriteVisitor.php b/src/Visitor/RewriteVisitor.php
@@ -98,9 +98,6 @@ public function enterNode(Node $node)
                     $this->logger->debug("> Enter block class: $class");
                 }
                 $reflection = new \ReflectionClass($class);
-                if ($reflection->isSubclassOf(ImiAnnotationBase::class)) {
-                    return;
-                }
                 // 设置顶级类
                 $this->topClassReflection = $reflection;
                 break;

diff --git a/tests/CodeRewriteTest.php b/tests/CodeRewriteTest.php
@@ -248,5 +248,34 @@ class TestScheduler
                 
                 PHP,
         ];
+
+        yield [
+            __DIR__ . '/Stub/TestBaseInjectValue.php',
+            <<<PHP
+                <?php
+                
+                declare(strict_types=1);
+                
+                namespace Imiphp\Tests\Stub;
+                
+                use Imi\Bean\Annotation\Base;
+                use Imi\Bean\Annotation\Parser;
+                
+                /**
+                 * 注入值注解基类.
+                 */
+                #[Parser(className: \Imi\Bean\Parser\BeanParser::class)]
+                abstract class TestBaseInjectValue extends Base
+                {
+                    /**
+                     * 获取注入值的真实值
+                     *
+                     * @return mixed
+                     */
+                    abstract public function getRealValue();
+                }
+                
+                PHP,
+        ];
     }
 }
diff --git a/tests/Stub/TestBaseInjectValue.php b/tests/Stub/TestBaseInjectValue.php
@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Imiphp\Tests\Stub;
+
+use Imi\Bean\Annotation\Base;
+use Imi\Bean\Annotation\Parser;
+
+/**
+ * 注入值注解基类.
+ *
+ * @Parser("\Imi\Bean\Parser\BeanParser")
+ */
+abstract class TestBaseInjectValue extends Base
+{
+    /**
+     * 获取注入值的真实值
+     *
+     * @return mixed
+     */
+    abstract public function getRealValue();
+}