cs fix

next-laboratory · Sep 3, 2024 · 0161058 · 0161058
1 parent 31aae18
commit 0161058
Show file tree

Hide file tree

Showing 128 changed files with 1,144 additions and 1,626 deletions.
diff --git a/src/aop/publish/aop.php b/src/aop/publish/aop.php
@@ -9,13 +9,23 @@
  * @license  https://github.com/next-laboratory/next/blob/master/LICENSE
  */
 
+use Next\Aop\Collector\AspectCollector;
+use Next\Aop\Collector\PropertyAttributeCollector;
+
+/**
+ * This file is part of nextphp.
+ *
+ * @see     https://github.com/next-laboratory
+ * @license  https://github.com/next-laboratory/next/blob/master/LICENSE
+ */
+
 return [
     'scanDirs'   => [
         __DIR__ . '/app',
     ],
     'collectors' => [
-        \Next\Aop\Collector\AspectCollector::class,
-        \Next\Aop\Collector\PropertyAttributeCollector::class,
+        AspectCollector::class,
+        PropertyAttributeCollector::class,
     ],
     'runtimeDir' => __DIR__ . '/runtime/aop',
 ];
diff --git a/src/aop/src/Aop.php b/src/aop/src/Aop.php
@@ -3,7 +3,7 @@
 declare(strict_types=1);
 
 /**
- * This file is part of MarxPHP.
+ * This file is part of nextphp.
  *
  * @link     https://github.com/next-laboratory
  * @license  https://github.com/next-laboratory/next/blob/master/LICENSE
@@ -31,15 +31,14 @@ final class Aop
     private Filesystem $filesystem;
 
     private function __construct(
-        private array  $scanDirs = [],
-        private array  $collectors = [],
+        private array $scanDirs = [],
+        private array $collectors = [],
         private string $runtimeDir = '',
-    )
-    {
+    ) {
         $this->filesystem = new Filesystem();
         $this->astManager = new AstManager();
         $this->runtimeDir = rtrim($runtimeDir, '/\\') . '/';
-        if (!$this->filesystem->isDirectory($this->runtimeDir)) {
+        if (! $this->filesystem->isDirectory($this->runtimeDir)) {
             $this->filesystem->makeDirectory($this->runtimeDir, 0755, true);
         }
         $this->findClasses($this->scanDirs);
@@ -51,37 +50,34 @@ private function __construct(
         } else {
             $this->filesystem->exists($this->proxyMapFile) && $this->filesystem->delete($this->proxyMapFile);
         }
-        if (!$this->filesystem->exists($this->proxyMapFile)) {
+        if (! $this->filesystem->exists($this->proxyMapFile)) {
             touch($lockFile);
             $this->filesystem->exists($this->proxyMapFile) && $this->filesystem->delete($this->proxyMapFile);
             global $argv;
             $cmd    = PHP_BINARY . ' ' . implode(' ', $argv) . ' 2>&1';
             $result = shell_exec($cmd);
             if ($result) {
-                print($result . PHP_EOL);
+                echo $result . PHP_EOL;
             }
-//            if (($pid = pcntl_fork()) == -1) {
-//                throw new \RuntimeException('Process fork failed.');
-//            }
-//            pcntl_wait($pid);
+            //            if (($pid = pcntl_fork()) == -1) {
+            //                throw new \RuntimeException('Process fork failed.');
+            //            }
+            //            pcntl_wait($pid);
         }
         Composer::getClassLoader()->addClassMap($this->getProxyMap());
         $this->collect();
         unset($this->filesystem, $this->astManager);
         Reflection::clear();
     }
 
-    private function __clone(): void
-    {
-    }
+    private function __clone(): void {}
 
     public static function init(
-        array  $scanDirs = [],
-        array  $collectors = [],
+        array $scanDirs = [],
+        array $collectors = [],
         string $runtimeDir = '',
-        bool   $cache = false
-    ): void
-    {
+        bool $cache = false
+    ): void {
         new self($scanDirs, $collectors, $runtimeDir, $cache);
     }
 
@@ -106,7 +102,7 @@ private function findClasses(array $dirs): void
      */
     private function getProxyMap(): array
     {
-        if (!$this->filesystem->exists($this->proxyMapFile)) {
+        if (! $this->filesystem->exists($this->proxyMapFile)) {
             $proxyDir = $this->runtimeDir . 'proxy/';
             $this->filesystem->exists($proxyDir) || $this->filesystem->makeDirectory($proxyDir, 0755, true, true);
             $this->filesystem->cleanDirectory($proxyDir);
@@ -150,7 +146,7 @@ private function collect(): void
             foreach ($reflectionClass->getAttributes() as $attribute) {
                 try {
                     $attributeInstance = $attribute->newInstance();
-                    if (!$attributeInstance instanceof \Attribute) {
+                    if (! $attributeInstance instanceof \Attribute) {
                         foreach ($this->collectors as $collector) {
                             $collector::collectClass($class, $attributeInstance);
                         }

diff --git a/src/aop/src/AstManager.php b/src/aop/src/AstManager.php
@@ -15,7 +15,6 @@
 use PhpParser\Node\Stmt\Namespace_;
 use PhpParser\Parser;
 use PhpParser\ParserFactory;
-use PhpParser\PhpVersion;
 
 class AstManager
 {

diff --git a/src/aop/src/Attribute/AspectConfig.php b/src/aop/src/Attribute/AspectConfig.php
@@ -11,9 +11,7 @@
 
 namespace Next\Aop\Attribute;
 
-use Attribute;
-
-#[Attribute(Attribute::TARGET_CLASS | Attribute::IS_REPEATABLE)]
+#[\Attribute(\Attribute::TARGET_CLASS | \Attribute::IS_REPEATABLE)]
 class AspectConfig
 {
     /**
@@ -23,8 +21,7 @@ class AspectConfig
      */
     public function __construct(
         public string $class,
-        public string|array $methods = '*',
+        public array|string $methods = '*',
         public array $params = []
-    ) {
-    }
+    ) {}
 }
diff --git a/src/aop/src/Collector/AbstractCollector.php b/src/aop/src/Collector/AbstractCollector.php
@@ -15,19 +15,11 @@
 
 abstract class AbstractCollector implements CollectorInterface
 {
-    public static function collectClass(string $class, object $attribute): void
-    {
-    }
+    public static function collectClass(string $class, object $attribute): void {}
 
-    public static function collectMethod(string $class, string $method, object $attribute): void
-    {
-    }
+    public static function collectMethod(string $class, string $method, object $attribute): void {}
 
-    public static function collectProperty(string $class, string $property, object $attribute): void
-    {
-    }
+    public static function collectProperty(string $class, string $property, object $attribute): void {}
 
-    public static function collectorMethodParameter(string $class, string $method, string $parameter, object $attribute)
-    {
-    }
+    public static function collectorMethodParameter(string $class, string $method, string $parameter, object $attribute) {}
 }
diff --git a/src/aop/src/Collector/AspectCollector.php b/src/aop/src/Collector/AspectCollector.php
@@ -11,11 +11,10 @@
 
 namespace Next\Aop\Collector;
 
+use Next\Aop\Aop;
 use Next\Aop\Attribute\AspectConfig;
 use Next\Aop\Contract\AspectInterface;
-use Next\Aop\Aop;
 use Next\Di\Reflection;
-use ReflectionException;
 
 class AspectCollector extends AbstractCollector
 {
@@ -32,13 +31,13 @@ public static function collectMethod(string $class, string $method, object $attr
     }
 
     /**
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public static function collectClass(string $class, object $attribute): void
     {
         if ($attribute instanceof AspectInterface) {
             foreach (Reflection::class($class)->getMethods() as $reflectionMethod) {
-                if (!$reflectionMethod->isConstructor()) {
+                if (! $reflectionMethod->isConstructor()) {
                     self::$container[$class][$reflectionMethod->getName()][] = $attribute;
                 }
             }
@@ -48,12 +47,12 @@ public static function collectClass(string $class, object $attribute): void
             $methods         = $attribute->methods;
             if ($methods === '*') {
                 foreach ($reflectionClass->getMethods() as $reflectionMethod) {
-                    if (!$reflectionMethod->isConstructor()) {
+                    if (! $reflectionMethod->isConstructor()) {
                         self::$container[$attribute->class][$reflectionMethod->getName()][] = $annotation;
                     }
                 }
             } else {
-                foreach ((array)$methods as $method) {
+                foreach ((array) $methods as $method) {
                     self::$container[$attribute->class][$method][] = $annotation;
                 }
             }

diff --git a/src/aop/src/Exception/PropertyHandleException.php b/src/aop/src/Exception/PropertyHandleException.php
@@ -11,8 +11,4 @@
 
 namespace Next\Aop\Exception;
 
-use RuntimeException;
-
-class PropertyHandleException extends RuntimeException
-{
-}
+class PropertyHandleException extends \RuntimeException {}
diff --git a/src/aop/src/Metadata.php b/src/aop/src/Metadata.php
@@ -20,6 +20,5 @@ class Metadata
     public function __construct(
         public string $className,
         public bool $hasConstructor = false
-    ) {
-    }
+    ) {}
 }
diff --git a/src/aop/src/ProceedingJoinPoint.php b/src/aop/src/ProceedingJoinPoint.php
@@ -11,27 +11,23 @@
 
 namespace Next\Aop;
 
-use ArrayObject;
-use Closure;
 use Next\Aop\Contract\AspectInterface;
 
 class ProceedingJoinPoint
 {
     /**
      * @param string                      $class      切入的类名
      * @param string                      $method     切入的方法
-     * @param ArrayObject                 $parameters 当前方法传递的参数列表【索引数组】
+     * @param \ArrayObject                $parameters 当前方法传递的参数列表【索引数组】
      * @param array<int, AspectInterface> $aspects
      */
     public function __construct(
-        protected array    $aspects,
-        protected Closure  $callback,
-        public string      $class,
-        public string      $method,
-        public ArrayObject $parameters,
-    )
-    {
-    }
+        protected array $aspects,
+        protected \Closure $callback,
+        public string $class,
+        public string $method,
+        public \ArrayObject $parameters,
+    ) {}
 
     public function process()
     {

diff --git a/src/aop/src/PropertyHandlerVisitor.php b/src/aop/src/PropertyHandlerVisitor.php
@@ -16,7 +16,6 @@
 use PhpParser\Node;
 use PhpParser\Node\Arg;
 use PhpParser\Node\Expr\ClassConstFetch;
-use PhpParser\Node\Expr\ConstFetch;
 use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Expr\StaticCall;
@@ -30,17 +29,12 @@
 use PhpParser\Node\Stmt\TraitUse;
 use PhpParser\NodeVisitorAbstract;
 use PhpParser\ParserFactory;
-use ReflectionException;
-use ReflectionNamedType;
-use ReflectionUnionType;
 
 class PropertyHandlerVisitor extends NodeVisitorAbstract
 {
     public function __construct(
         protected Metadata $metadata
-    )
-    {
-    }
+    ) {}
 
     public function enterNode(Node $node)
     {
@@ -50,7 +44,7 @@ public function enterNode(Node $node)
     }
 
     /**
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function leaveNode(Node $node)
     {
@@ -79,11 +73,11 @@ public function leaveNode(Node $node)
                 foreach ($reflectionConstructor->getParameters() as $key => $reflectionParameter) {
                     $type = $reflectionParameter->getType();
                     if (is_null($type)
-                        || ($type instanceof ReflectionNamedType && ($type->isBuiltin() || $type->getName() === 'Closure'))
+                        || ($type instanceof \ReflectionNamedType && ($type->isBuiltin() || $type->getName() === 'Closure'))
                     ) {
                         continue;
                     }
-                    if ($type instanceof ReflectionUnionType) {
+                    if ($type instanceof \ReflectionUnionType) {
                         $unionType = [];
                         foreach ($type->getTypes() as $reflectionNamedType) {
                             $unionType[] = ($reflectionNamedType->isBuiltin() ? '' : '\\') . $reflectionNamedType->getName();
@@ -96,7 +90,7 @@ public function leaveNode(Node $node)
                 }
             }
             $c = [];
-            if (!$this->metadata->hasConstructor) {
+            if (! $this->metadata->hasConstructor) {
                 $constructor        = new ClassMethod('__construct', [
                     'params' => $params,
                 ]);

diff --git a/src/aop/src/ProxyHandler.php b/src/aop/src/ProxyHandler.php
@@ -11,34 +11,31 @@
 
 namespace Next\Aop;
 
-use ArrayObject;
-use Closure;
 use Next\Aop\Collector\AspectCollector;
 use Next\Di\Reflection;
-use ReflectionException;
 
 trait ProxyHandler
 {
     /**
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
-    protected static function __callViaProxy(string $method, Closure $callback, array $parameters): mixed
+    protected static function __callViaProxy(string $method, \Closure $callback, array $parameters): mixed
     {
         $class = static::class;
-//        /** @var AspectInterface $aspect */
-//        $pipeline         = array_reduce(
-//            array_reverse(AspectCollector::getMethodAspects($class, $method)),
-//            fn($stack, $aspect) => fn(JoinPoint $joinPoint) => $aspect->process($joinPoint, $stack),
-//            fn(JoinPoint $joinPoint) => $joinPoint->process()
-//        );
-        $args             = new ArrayObject();
+        //        /** @var AspectInterface $aspect */
+        //        $pipeline         = array_reduce(
+        //            array_reverse(AspectCollector::getMethodAspects($class, $method)),
+        //            fn($stack, $aspect) => fn(JoinPoint $joinPoint) => $aspect->process($joinPoint, $stack),
+        //            fn(JoinPoint $joinPoint) => $joinPoint->process()
+        //        );
+        $args             = new \ArrayObject();
         $methodParameters = Reflection::methodParameterNames($class, $method);
         foreach ($parameters as $key => $parameter) {
             $args->offsetSet($methodParameters[$key], $parameter);
         }
 
         $aspects = AspectCollector::getMethodAspects($class, $method);
         return (new ProceedingJoinPoint($aspects, $callback, $class, $method, $args))->process();
-//        return $pipeline(new JoinPoint($class, $method, $funcArgs, $callback));
+        //        return $pipeline(new JoinPoint($class, $method, $funcArgs, $callback));
     }
 }
diff --git a/src/aop/src/ProxyHandlerVisitor.php b/src/aop/src/ProxyHandlerVisitor.php
@@ -33,9 +33,7 @@ class ProxyHandlerVisitor extends NodeVisitorAbstract
 {
     public function __construct(
         protected Metadata $metadata
-    )
-    {
-    }
+    ) {}
 
     public function leaveNode(Node $node)
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,9 +33,7 @@ class ProxyHandlerVisitor extends NodeVisitorAbstract @@
     {
         public function __construct(
             protected Metadata $metadata
-        )
-        {
-        }
+        ) {}
         public function leaveNode(Node $node)
         {
@@ Expand Down @@