dev

biiiiiigmonster · Jun 9, 2021 · b904a57 · b904a57
1 parent 597e47a
commit b904a57
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 27 deletions.
diff --git a/src/AspectHandler.php b/src/AspectHandler.php
@@ -35,7 +35,7 @@ public function __invoke(Pointer $pointer): mixed
 
         try {
             // Execute Around
-            $pointer->setValue(
+            $pointer->setReturn(
                 $around ? $around->invoke($aspectInstance, $pointer) : $pointer->process()
             );
         } catch (Throwable $throwable) {
@@ -49,16 +49,16 @@ public function __invoke(Pointer $pointer): mixed
         if ($pointer->getThrowable()) {
             // Execute AfterThrowing
             if ($afterThrowing) {
-                $pointer->setValue($afterThrowing->invoke($aspectInstance, $pointer->getThrowable(), $pointer));
+                $pointer->setReturn($afterThrowing->invoke($aspectInstance, $pointer->getThrowable(), $pointer));
             } else {
                 throw $pointer->getThrowable();
             }
         } else {
             // Execute AfterReturning
-            if ($afterReturning) $pointer->setValue($afterReturning->invoke($aspectInstance, $pointer));
+            if ($afterReturning) $pointer->setReturn($afterReturning->invoke($aspectInstance, $pointer));
         }
 
-        return $pointer->getValue();
+        return $pointer->getReturn();
     }
 
     /**

diff --git a/src/Concerns/AopTrait.php b/src/Concerns/AopTrait.php
@@ -18,7 +18,6 @@ public static function __onion(array $skins): Closure
         $through = fn(Closure $stack, array $skin) => function (Pointer $pointer) use ($stack, $skin) {
             $aspectHandler = new AspectHandler();
             $pointer->into($skin);
-            $pointer->setHandler($aspectHandler);
             $pointer->setTarget($stack);
             $aspectHandler($pointer);
         };

diff --git a/src/Concerns/Pointer.php b/src/Concerns/Pointer.php
@@ -8,44 +8,43 @@
 
 abstract class Pointer
 {
-    protected AspectHandler $handler;
     protected Closure $target;
-    protected mixed $value;
-    protected array $types;
+    protected mixed $return;
+    protected array $returnTypes;
     protected ?Throwable $throwable = null;
     protected ?object $curAspectInstance = null;// 当前所处切面实例
     protected ?object $curAttributeInstance = null;// 当前所处注解实例
 
     /**
      * @return mixed
      */
-    public function getValue(): mixed
+    public function getReturn(): mixed
     {
-        return $this->value;
+        return $this->return;
     }
 
     /**
-     * @param mixed $value
+     * @param mixed $return
      */
-    public function setValue(mixed $value): void
+    public function setReturn(mixed $return): void
     {
-        $this->value = $value;
+        $this->return = $return;
     }
 
     /**
      * @return array
      */
-    public function getTypes(): array
+    public function getReturnTypes(): array
     {
-        return $this->types;
+        return $this->returnTypes;
     }
 
     /**
-     * @param array $types
+     * @param array $returnTypes
      */
-    public function setTypes(array $types): void
+    public function setReturnTypes(array $returnTypes): void
     {
-        $this->types = $types;
+        $this->returnTypes = $returnTypes;
     }
 
     /**
@@ -88,14 +87,6 @@ public function setTarget(Closure $target): void
         $this->target = $target;
     }
 
-    /**
-     * @param AspectHandler $handler
-     */
-    public function setHandler(AspectHandler $handler): void
-    {
-        $this->handler = $handler;
-    }
-
     /**
      * @param array $skin
      * @return Pointer

diff --git a/src/Point/FunctionPointer.php b/src/Point/FunctionPointer.php
@@ -36,7 +36,7 @@ public function __construct(
         // Parse ReflectionMethod Data.
         $methodRfc = new ReflectionMethod($className, $method);
         $this->argsMap = $this->parseArgsMap($methodRfc);
-        $this->types = $this->parseReturnType($methodRfc);
+        $this->returnTypes = $this->parseReturnType($methodRfc);
     }
 
     /**