up: format some codes for aop

Author: inhere

src/aop/src/Annotation/Mapping/Aspect.php

@@ -5,6 +5,7 @@
 use Doctrine\Common\Annotations\Annotation\Attribute;
 use Doctrine\Common\Annotations\Annotation\Attributes;
 use Doctrine\Common\Annotations\Annotation\Target;
+use const PHP_INT_MAX;
 
 /**
  * Class Aspect
@@ -49,4 +50,4 @@ public function getOrder(): int
     {
         return $this->order;
     }
-}
+}

src/aop/src/AspectHandler.php

@@ -134,14 +134,15 @@ public function invokeTarget(array $params = [])
         $before = $this->aspect['before'] ?? [];
 
         // Invoke before advice
-        if (!empty($before)) {
+        if ($before) {
             $this->invokeAdvice($before);
         }
 
         // Invoke next aspect
-        if (!empty($this->aspects)) {
-            $nextAspect      = $this->nextHandler();
-            $result          = $nextAspect->invokeAspect();
+        if ($this->aspects) {
+            $nextAspect = $this->nextHandler();
+            $result     = $nextAspect->invokeAspect();
+
             $this->throwable = $nextAspect->throwable;
 
             return $result;

src/aop/src/Ast/Visitor/ProxyVisitor.php

@@ -11,6 +11,7 @@
 use Swoft\Stdlib\Helper\Str;
 use function array_unshift;
 use function sprintf;
+use function strpos;
 
 /**
  * Class ProxyVisitor
@@ -32,21 +33,21 @@ class ProxyVisitor extends Visitor
     private $namespace = '';
 
     /**
-     * New class name
+     * New class name. it's random string. eg: '5e8455cdd6887'
      *
      * @var string
      */
     private $proxyId;
 
     /**
-     * Origin class name
+     * Origin class name. eg: 'SameNamespace\\SomeClass'
      *
      * @var string
      */
     private $originalClassName = '';
 
     /**
-     * Proxy class name without namespace
+     * Proxy class name without namespace. eg: 'SomeClass_PROXY_5e8455cdd6887'
      *
      * @var string
      */
@@ -68,7 +69,8 @@ class ProxyVisitor extends Visitor
     public function __construct(string $proxyId = '', string $aopClassName = AopTrait::class)
     {
         $this->aopClassName = $aopClassName;
-        $this->proxyId      = $proxyId ?: Str::getUniqid();
+
+        $this->proxyId = $proxyId ?: Str::getUniqid();
     }
 
     /**
@@ -82,7 +84,6 @@ public function enterNode(Node $node)
     {
         // Namespace for proxy class name
         if ($node instanceof Node\Stmt\Namespace_) {
-
             $this->namespace = $node->name->toString();
             return null;
         }
@@ -116,7 +117,6 @@ public function leaveNode(Node $node)
 
         // Parse new class node
         if ($node instanceof Node\Stmt\Class_) {
-
             // Fix such as '\Xxxx' class bug
             $extendClass = $this->originalClassName;
             if (strpos($extendClass, '\\') !== 0) {
@@ -181,7 +181,7 @@ private function proxyMethod(ClassMethod $node): ClassMethod
     {
         $methodName = $node->name->toString();
 
-        $params = [];
+        $params = []; // TODO ??
         foreach ($node->params as $key => $param) {
             $params[] = $param;
         }

src/aop/src/Concern/AopTrait.php

@@ -24,6 +24,7 @@ trait AopTrait
      *
      * @return mixed
      * @throws Throwable
+     * @noinspection MagicMethodsValidityInspection
      */
     public function __proxyCall(string $className, string $methodName, array $args)
     {
@@ -53,6 +54,7 @@ public function __proxyCall(string $className, string $methodName, array $args)
      * @param array  $args
      *
      * @return mixed
+     * @noinspection MagicMethodsValidityInspection
      */
     public function __invokeTarget(string $methodName, array $args)
     {

src/aop/src/Proxy.php

@@ -5,6 +5,8 @@
 use Swoft\Aop\Ast\Visitor\ProxyVisitor;
 use Swoft\Proxy\Exception\ProxyException;
 use Swoft\Proxy\Proxy as BaseProxy;
+use function explode;
+use function strpos;
 
 /**
  * Class Proxy
@@ -28,7 +30,7 @@ public static function newClassName(string $className): string
             return $className;
         }
 
-        // Ignore aop proxy
+        // Is RPC proxy
         if (strpos($className, '_IGNORE_') !== false) {
             return $className;
         }
@@ -46,7 +48,7 @@ public static function newClassName(string $className): string
      */
     public static function getClassName(string $proxyClassName): string
     {
-        list($className) = explode('_', $proxyClassName);
+        [$className] = explode('_', $proxyClassName);
         return $className;
     }
 
@@ -59,8 +61,8 @@ public static function getClassName(string $proxyClassName): string
      */
     public static function getOriginalClassName(string $proxyClassName): string
     {
-        $proxys = explode(ProxyVisitor::PROXY, $proxyClassName);
+        $proxies = explode(ProxyVisitor::PROXY, $proxyClassName);
 
-        return $proxys[0];
+        return $proxies[0];
     }
 }