支持在 PointCut 中指定优先级

imiphp · Mar 20, 2024 · 739a62e · 739a62e
1 parent 061bfb2
commit 739a62e
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 15 deletions.
diff --git a/doc/components/aop/index.md b/doc/components/aop/index.md
@@ -61,6 +61,12 @@ AOP 可以很好地解决这个问题，不仅可以在编写上不用事先定
 
 普通的类，你要切入的类。
 
+**参数：**
+
+名称 | 描述 | 默认值
+-|-|-
+priority | 优先级，越大越先执行 | `0`
+
 ### 切入点 PointCut
 
 普通类中的方法，你要切入的方法。
@@ -72,6 +78,7 @@ AOP 可以很好地解决这个问题，不仅可以在编写上不用事先定
 type | 切入点类型，PointCutType::XXX | PointCutType::METHOD
 allow | 允许的切入点 | `[]`
 deny | 不允许的切入点，即使包含中有的，也可以被排除 | `[]`
+priority | 优先级，越大越先执行，为 `null` 时使用 `Aspect` 设置 | `null`
 
 **切入点类型（`\Imi\Aop\PointCutType`）：**
 
@@ -252,7 +259,7 @@ return [
                     ]
                 ],
                 'after'    =>    [
-                    
+
                 ]
             ]
         ]
@@ -380,15 +387,15 @@ class TestClass
      */
     #[Inject(name: \XXX\Model\User::class)]
     protected $model;
-    
+
     /**
      * 某Model对象，通过注释类型注入
-     * 
+     *
      * @var XXX\Model\User
      */
     #[Inject]
     protected $model2;
-    
+
     /**
      * 某Model对象，类型声明注入
      */

diff --git a/src/Aop/Annotation/PointCut.php b/src/Aop/Annotation/PointCut.php
@@ -25,7 +25,12 @@ public function __construct(
         /**
          * 不允许的切入点，即使包含中有的，也可以被排除.
          */
-        public array $deny = []
+        public array $deny = [],
+        /**
+         * 优先级，越大越先执行.
+         * 为 null 时使用 Aspect 设置.
+         */
+        public ?int $priority = null
     ) {
     }
 }
diff --git a/src/Aop/AopAnnotationLoader.php b/src/Aop/AopAnnotationLoader.php
@@ -77,39 +77,39 @@ public static function load(bool $force = true): void
                                         'deny'  => $pointCut->deny,
                                         'extra' => $beforeAnnotation->toArray(),
                                     ];
-                                    AopManager::addBefore($class, $method, $callback, $aspectAnnotation->priority, $options);
+                                    AopManager::addBefore($class, $method, $callback, $pointCut->priority ?? $aspectAnnotation->priority, $options);
                                 }
                                 if ($afterAnnotation)
                                 {
                                     $options = [
                                         'deny'  => $pointCut->deny,
                                         'extra' => $afterAnnotation->toArray(),
                                     ];
-                                    AopManager::addAfter($class, $method, $callback, $aspectAnnotation->priority, $options);
+                                    AopManager::addAfter($class, $method, $callback, $pointCut->priority ?? $aspectAnnotation->priority, $options);
                                 }
                                 if ($aroundAnnotation)
                                 {
                                     $options = [
                                         'deny'  => $pointCut->deny,
                                         'extra' => $aroundAnnotation->toArray(),
                                     ];
-                                    AopManager::addAround($class, $method, $callback, $aspectAnnotation->priority, $options);
+                                    AopManager::addAround($class, $method, $callback, $pointCut->priority ?? $aspectAnnotation->priority, $options);
                                 }
                                 if ($afterReturningAnnotation)
                                 {
                                     $options = [
                                         'deny'  => $pointCut->deny,
                                         'extra' => $afterReturningAnnotation->toArray(),
                                     ];
-                                    AopManager::addAfterReturning($class, $method, $callback, $aspectAnnotation->priority, $options);
+                                    AopManager::addAfterReturning($class, $method, $callback, $pointCut->priority ?? $aspectAnnotation->priority, $options);
                                 }
                                 if ($afterThrowingAnnotation)
                                 {
                                     $options = [
                                         'deny'  => $pointCut->deny,
                                         'extra' => $afterThrowingAnnotation->toArray(),
                                     ];
-                                    AopManager::addAfterThrowing($class, $method, $callback, $aspectAnnotation->priority, $options);
+                                    AopManager::addAfterThrowing($class, $method, $callback, $pointCut->priority ?? $aspectAnnotation->priority, $options);
                                 }
                             }
                             break;
@@ -143,39 +143,39 @@ public static function load(bool $force = true): void
                                             'deny'  => $pointCut->deny,
                                             'extra' => $beforeAnnotation->toArray(),
                                         ];
-                                        AopManager::addBefore($class, $method, $callback, $aspectAnnotation->priority, $options);
+                                        AopManager::addBefore($class, $method, $callback, $pointCut->priority ?? $aspectAnnotation->priority, $options);
                                     }
                                     if ($afterAnnotation)
                                     {
                                         $options = [
                                             'deny'  => $pointCut->deny,
                                             'extra' => $afterAnnotation->toArray(),
                                         ];
-                                        AopManager::addAfter($class, $method, $callback, $aspectAnnotation->priority, $options);
+                                        AopManager::addAfter($class, $method, $callback, $pointCut->priority ?? $aspectAnnotation->priority, $options);
                                     }
                                     if ($aroundAnnotation)
                                     {
                                         $options = [
                                             'deny'  => $pointCut->deny,
                                             'extra' => $aroundAnnotation->toArray(),
                                         ];
-                                        AopManager::addAround($class, $method, $callback, $aspectAnnotation->priority, $options);
+                                        AopManager::addAround($class, $method, $callback, $pointCut->priority ?? $aspectAnnotation->priority, $options);
                                     }
                                     if ($afterReturningAnnotation)
                                     {
                                         $options = [
                                             'deny'  => $pointCut->deny,
                                             'extra' => $afterReturningAnnotation->toArray(),
                                         ];
-                                        AopManager::addAfterReturning($class, $method, $callback, $aspectAnnotation->priority, $options);
+                                        AopManager::addAfterReturning($class, $method, $callback, $pointCut->priority ?? $aspectAnnotation->priority, $options);
                                     }
                                     if ($afterThrowingAnnotation)
                                     {
                                         $options = [
                                             'deny'  => $pointCut->deny,
                                             'extra' => $afterThrowingAnnotation->toArray(),
                                         ];
-                                        AopManager::addAfterThrowing($class, $method, $callback, $aspectAnnotation->priority, $options);
+                                        AopManager::addAfterThrowing($class, $method, $callback, $pointCut->priority ?? $aspectAnnotation->priority, $options);
                                     }
                                 }
                             }