修复自定义注解无法使用Aop切面编程的BUG (swoft-cloud/swoft-component#139)

* 增加自定义Aop注解测试 * 增加自定义方法注解，支持PointAnnotation * 完善单测 * 删除CustomMethod注解 * 通过自定义Parser收集注解测试 * 删除CustomMethod注解
swoft-cloud · Jul 24, 2018 · b60ec7f · b60ec7f
1 parent 668b1f9
commit b60ec7f
Show file tree

Hide file tree

Showing 8 changed files with 108 additions and 6 deletions.
diff --git a/framework/src/Bean/Wrapper/AbstractWrapper.php b/framework/src/Bean/Wrapper/AbstractWrapper.php
@@ -207,8 +207,7 @@ private function parseMethodAnnotations(string $className, \ReflectionMethod $me
         // 循环方法注解解析
         foreach ($methodAnnotations[$methodName] as $methodAnnotationAry) {
             foreach ($methodAnnotationAry as $methodAnnotation) {
-                $annotationClass = get_class($methodAnnotation);
-                if (!in_array($annotationClass, $this->getMethodAnnotations())) {
+                if (!$this->inMethodAnnotations($methodAnnotation)) {
                     continue;
                 }
 
@@ -223,6 +222,15 @@ private function parseMethodAnnotations(string $className, \ReflectionMethod $me
         }
     }
 
+    /**
+     * @return bool
+     */
+    protected function inMethodAnnotations($methodAnnotation): bool
+    {
+        $annotationClass = get_class($methodAnnotation);
+        return in_array($annotationClass, $this->getMethodAnnotations());
+    }
+
     /**
      * 方法没有配置路由注解解析
      *

diff --git a/framework/src/Bean/Wrapper/BeanWrapper.php b/framework/src/Bean/Wrapper/BeanWrapper.php
@@ -83,6 +83,11 @@ public function isParsePropertyAnnotations(array $annotations): bool
      */
     public function isParseMethodAnnotations(array $annotations): bool
     {
-        return isset($annotations[Cacheable::class]) || isset($annotations[CachePut::class]);
+        return true;
+    }
+
+    protected function inMethodAnnotations($methodAnnotation): bool
+    {
+        return true;
     }
 }
diff --git a/framework/test/Cases/Aop/Annotation/DemoAnnotation.php b/framework/test/Cases/Aop/Annotation/DemoAnnotation.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace SwoftTest\Aop\Annotation;
+
+/**
+ * Class DemoAnnotation
+ * @Annotation
+ * @Target("METHOD")
+ * @package SwoftTest\Aop\Annotation
+ */
+class DemoAnnotation
+{
+    /**
+     * @var string
+     */
+    private $name;
+
+    public function __construct(array $values)
+    {
+        if (isset($values['name'])) {
+            $this->name = $values['name'];
+        }
+    }
+
+    /**
+     * @return string
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+}
diff --git a/framework/test/Cases/Aop/AnnotationAop.php b/framework/test/Cases/Aop/AnnotationAop.php
@@ -12,6 +12,7 @@
 use Swoft\Bean\Annotation\Bean;
 use Swoft\Bean\Annotation\Cacheable;
 use Swoft\Bean\Annotation\CachePut;
+use SwoftTest\Aop\Annotation\DemoAnnotation;
 
 /**
  *
@@ -41,4 +42,13 @@ public function cacheable()
     {
         return 'cacheable';
     }
+
+    /**
+     * @DemoAnnotation(name=" hello")
+     * @return string
+     */
+    public function demoAnnotation()
+    {
+        return 'demo';
+    }
 }
diff --git a/framework/test/Cases/Aop/AnnotationAspect.php b/framework/test/Cases/Aop/AnnotationAspect.php
@@ -15,13 +15,16 @@
 use Swoft\Bean\Annotation\PointAnnotation;
 use Swoft\Bean\Annotation\Cacheable;
 use Swoft\Bean\Annotation\CachePut;
+use SwoftTest\Aop\Annotation\DemoAnnotation;
+use SwoftTest\Aop\Collector\DemoCollector;
 
 /**
  * @Aspect
  * @PointAnnotation(
  *     include={
  *         Cacheable::class,
- *         CachePut::class
+ *         CachePut::class,
+ *         DemoAnnotation::class
  *     }
  * )
  * @uses      AnnotationAspect
@@ -37,9 +40,17 @@ class AnnotationAspect
      */
     public function around(ProceedingJoinPoint $proceedingJoinPoint)
     {
-        $tag = ' around before ';
+        $class = $proceedingJoinPoint->getTarget();
+        $method = $proceedingJoinPoint->getMethod();
+
+        $tag = '';
+        if ($annotation = DemoCollector::$methodAnnotations[get_class($class)][$method] ?? null) {
+            $tag .= $annotation->getName();
+        }
+
+        $tag .= ' around before ';
         $result = $proceedingJoinPoint->proceed();
         $tag .= ' around after ';
-        return $result.$tag;
+        return $result . $tag;
     }
 }
diff --git a/framework/test/Cases/Aop/Collector/DemoCollector.php b/framework/test/Cases/Aop/Collector/DemoCollector.php
@@ -0,0 +1,12 @@
+<?php
+namespace SwoftTest\Aop\Collector;
+
+class DemoCollector
+{
+    /**
+     * The annotations of method
+     *
+     * @var array
+     */
+    public static $methodAnnotations = [];
+}
diff --git a/framework/test/Cases/Aop/Parser/DemoAnnotationParser.php b/framework/test/Cases/Aop/Parser/DemoAnnotationParser.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace SwoftTest\Aop\Parser;
+
+use Swoft\Bean\Collector;
+use SwoftTest\Aop\Collector\DemoCollector;
+
+class DemoAnnotationParser
+{
+    public function parser(string $className, $objectAnnotation = null, string $propertyName = "", string $methodName = "", $propertyValue = null)
+    {
+        Collector::$methodAnnotations[$className][$methodName][] = get_class($objectAnnotation);
+        DemoCollector::$methodAnnotations[$className][$methodName] = $objectAnnotation;
+        return null;
+    }
+}
diff --git a/framework/test/Cases/AopTest.php b/framework/test/Cases/AopTest.php
@@ -64,6 +64,14 @@ public function testAnnotationAop()
         $this->assertEquals('cachePut around before  around after ', $result);
     }
 
+    public function testCustomAnnotationAop()
+    {
+        /* @var AnnotationAop $annotationBean*/
+        $annotationBean = App::getBean(AnnotationAop::class);
+        $result = $annotationBean->demoAnnotation();
+        $this->assertEquals('demo hello around before  around after ', $result);
+    }
+
     public function testRegAop()
     {
         /* @var RegBean $annotationBean*/