modify

Annotation/Aspect.php

@@ -28,12 +28,9 @@ defined('ASPECT_ERROR') or define('ASPECT_ERROR', 'Aspect annotation must implem
     }
 
 
-	/**
+
-	 * @param array $handler
+
-	 * @return mixed
+    public function execute(mixed $class, mixed $method = ''): mixed
-	 * @throws Exception
-	 */
-    public function execute(array $handler): mixed
     {
         // TODO: Change the autogenerated stub
         if (!in_array(IAspect::class, class_implements($this->aspect))) {
@@ -42,9 +39,9 @@ defined('ASPECT_ERROR') or define('ASPECT_ERROR', 'Aspect annotation must implem
         /** @var Aop $aop */
         $aop = Snowflake::app()->get('aop');
 
-        $aop->aop_add($handler, $this->aspect);
+        $aop->aop_add([$class, $method], $this->aspect);
 
-        return parent::execute($handler);
+        return true;
     }
 
 

Annotation/Asynchronous.php

@@ -5,6 +5,7 @@ namespace Annotation;
 
 
 use Exception;
+use HttpServer\IInterface\Task;
 use Snowflake\Snowflake;
 
 
@@ -32,10 +33,10 @@ use Snowflake\Snowflake;
 	 * @return bool
 	 * @throws Exception
 	 */
-	public function execute(array $handler): bool
+    public function execute(mixed $class, mixed $method = null): mixed
 	{
 		$async = Snowflake::app()->getAsync();
-		$async->addAsync($this->name, current($handler));
+		$async->addAsync($this->name, $class);
 		return true;
 	}
 

Annotation/Attribute.php

@@ -22,14 +22,11 @@ abstract class Attribute implements IAnnotation
 {
 
 
-	/**
+
-	 * @param array $handler
+    public function execute(mixed $class, mixed $method = ''): mixed
-	 * @return mixed
-	 */
-	public function execute(array $handler): mixed
     {
-		return $this;
+        // TODO: Implement execute() method.
+        return true;
     }
 
-
 }

Annotation/Event.php

@@ -33,10 +33,10 @@ use Snowflake\Event as SEvent;
 	 * @return bool
 	 * @throws Exception
 	 */
-	public function execute(array $handler): bool
+    public function execute(mixed $class, mixed $method = null): mixed
 	{
 		// TODO: Implement execute() method.
-		SEvent::on($this->name, $handler, $this->params);
+		SEvent::on($this->name, [$class, $method], $this->params);
 		return true;
 	}
 

Annotation/FileTree.php

@@ -1,80 +0,0 @@
-<?php
-
-
-namespace Annotation;
-
-
-class FileTree
-{
-
-	private array $files = [];
-
-
-	private array $childes = [];
-
-
-	private string $_filePath = '';
-
-
-	/**
-	 * @param $path
-	 * @return $this|null
-	 */
-	public function getChild($path): ?static
-	{
-		if (!isset($this->childes[$path])) {
-			$this->addChild($path, new FileTree());
-		}
-		return $this->childes[$path];
-	}
-
-
-	/**
-	 * @param string $path
-	 * @param FileTree $fileTree
-	 */
-	public function addChild(string $path, FileTree $fileTree)
-	{
-		$this->childes[$path] = $fileTree;
-	}
-
-
-	/**
-	 * @param string $className
-	 * @param string $path
-	 */
-	public function addFile(string $className, string $path)
-	{
-		$this->files[] = $className;
-		$this->_filePath = $path;
-	}
-
-
-	/**
-	 * @return array
-	 */
-	public function getFiles(): array
-	{
-		return $this->files;
-	}
-
-
-	/**
-	 * @return string
-	 */
-	public function getDirPath(): string
-	{
-		return $this->_filePath;
-	}
-
-
-	/**
-	 * @return array
-	 */
-	public function getChildes(): array
-	{
-		return $this->childes;
-	}
-
-
-}

Annotation/IAnnotation.php

@@ -13,7 +13,7 @@ interface IAnnotation
      * @param array $handler
      * @return mixed
      */
-	public function execute(array $handler): mixed;
+    public function execute(mixed $class, mixed $method = ''): mixed;
 
 
 }

Annotation/Inject.php

@@ -31,24 +31,24 @@ use Snowflake\Snowflake;
      * @return mixed
      * @throws Exception
      */
-	public function execute(array $handler): mixed
+    public function execute(mixed $class, mixed $method = null): mixed
     {
         $injectValue = $this->parseInjectValue();
-		if (!($handler[1] instanceof ReflectionProperty)) {
+        if (!($class instanceof ReflectionProperty)) {
-			$handler[1] = new ReflectionProperty($handler[0], $handler[1]);
+            $class = new ReflectionProperty($class, $method);
         }
 
-		/** @var ReflectionProperty $handler [1] */
+        /** @var ReflectionProperty $class */
-		if ($handler[1]->isPrivate() || $handler[1]->isProtected()) {
+        if ($class->isPrivate() || $class->isProtected()) {
-			$method = 'set' . ucfirst($handler[1]->getName());
+            $method = 'set' . ucfirst($class->getName());
-			if (!method_exists($handler[0], $method)) {
+            if (!method_exists($class, $method)) {
                 return false;
             }
-			$handler[0]->$method($injectValue);
+            $class->$method($injectValue);
         } else {
-			$handler[0]->{$handler[1]->getName()} = $injectValue;
+            $class->{$method->getName()} = $injectValue;
         }
-		return $handler[0];
+        return true;
     }
 
 

Annotation/Kafka.php

@@ -30,17 +30,17 @@ use Snowflake\Snowflake;
      * @param array $handler
      * @return mixed
      */
-    public function execute(array $handler): mixed
+    public function execute(mixed $class, mixed $method = null): mixed
     {
-        if (!($handler[0] instanceof ConsumerInterface)) {
+        if (!($class instanceof ConsumerInterface)) {
             return false;
         }
 
         /** @var TaskContainer $container */
         $container = Snowflake::app()->get('kafka-container');
-        $container->addConsumer($this->topic, [$handler[0], 'onHandler']);
+        $container->addConsumer($this->topic, [$class, 'onHandler']);
 
-        return parent::execute($handler); // TODO: Change the autogenerated stub
+        return true;
     }
 
 

Annotation/Loader.php

@@ -33,9 +33,6 @@ class Loader extends BaseObject
     private array $_directory = [];
 
 
-    private FileTree $files;
-
-
     /**
      * @return array
      */
@@ -44,13 +41,6 @@ class Loader extends BaseObject
         return $this->_directory;
     }
 
-
-    public function init()
-    {
-        $this->files = new FileTree();
-    }
-
-
     /**
      * @param $path
      * @param $namespace
@@ -102,7 +92,7 @@ class Loader extends BaseObject
         }
         foreach ($properties as $property => $attributes) {
             foreach ($attributes as $attribute) {
-                $attribute->execute([$handler, $property]);
+                $attribute->execute($handler, $property);
             }
         }
         return $this;
@@ -173,13 +163,50 @@ class Loader extends BaseObject
             if ($path->getExtension() !== 'php') {
                 return;
             }
-            $replace = Snowflake::getDi()->getReflect($this->explodeFileName($path, $namespace));
+            $replace = $this->getReflect($path, $namespace);
             if (empty($replace) || count($replace->getAttributes(Target::class)) < 1) {
                 return;
             }
             $this->appendFileToDirectory($path->getRealPath(), $replace->getName());
 
-            $_array = ['handler' => $replace->newInstance(), 'target' => [], 'methods' => [], 'property' => []];
+            $_array['handler'] = $replace->getName();
+            $_array['target'] = [];
+            $_array['methods'] = [];
+            $_array['property'] = [];
+
+            $_array = $this->_targets($replace, $_array);
+            $_array = $this->_methods($replace, $_array);
+            $_array = $this->_properties($replace, $_array);
+
+            $this->_fileMap[$replace->getFileName()] = $replace->getName();
+
+            $this->_classes[$replace->getName()] = $_array;
+        } catch (Throwable $throwable) {
+            $this->addError($throwable, 'throwable');
+        }
+    }
+
+
+    /**
+     * @param string $path
+     * @param string $namespace
+     * @return \ReflectionClass|null
+     * @throws \ReflectionException
+     * @throws \Snowflake\Exception\NotFindClassException
+     */
+    private function getReflect(DirectoryIterator $path, string $namespace): ?\ReflectionClass
+    {
+        return Snowflake::getDi()->getReflect($this->explodeFileName($path, $namespace));
+    }
+
+
+    /**
+     * @param \ReflectionClass $replace
+     * @param array $_array
+     * @return array
+     */
+    private function _targets(\ReflectionClass $replace, array $_array): array
+    {
         foreach ($replace->getAttributes() as $attribute) {
             if ($attribute->getName() == Attribute::class) {
                 continue;
@@ -189,7 +216,17 @@ class Loader extends BaseObject
             }
             $_array['target'][] = $attribute->newInstance();
         }
+        return $_array;
+    }
 
+
+    /**
+     * @param \ReflectionClass $replace
+     * @param array $_array
+     * @return array
+     */
+    private function _methods(\ReflectionClass $replace, array $_array): array
+    {
         $methods = $replace->getMethods(ReflectionMethod::IS_PUBLIC);
         foreach ($methods as $method) {
             $_method = [];
@@ -201,7 +238,17 @@ class Loader extends BaseObject
             }
             $_array['methods'][$method->getName()] = $_method;
         }
+        return $_array;
+    }
 
+
+    /**
+     * @param \ReflectionClass $replace
+     * @param array $_array
+     * @return array
+     */
+    private function _properties(\ReflectionClass $replace, array $_array): array
+    {
         $methods = $replace->getProperties();
         foreach ($methods as $method) {
             $_property = [];
@@ -214,13 +261,7 @@ class Loader extends BaseObject
             }
             $_array['property'][$method->getName()] = $_property;
         }
-
+        return $_array;
-            $this->_fileMap[$replace->getFileName()] = $replace->getName();
-
-            $this->_classes[$replace->getName()] = $_array;
-        } catch (Throwable $throwable) {
-            $this->addError($throwable, 'throwable');
-        }
     }
 
 
@@ -301,14 +342,17 @@ class Loader extends BaseObject
             return;
         }
         $annotation = Snowflake::getAnnotation();
+
         foreach ($classes as $className) {
             $annotations = $this->_classes[$className] ?? null;
             if ($annotations === null) {
                 continue;
             }
-            $class = clone $annotations['handler'];
+
+            $class = $this->newInstance($annotations['handler']);
+            /** @var \Annotation\Attribute $value */
             foreach ($annotations['target'] ?? [] as $value) {
-                $value->execute([$class]);
+                $value->execute($class);
             }
             foreach ($annotations['methods'] as $name => $attribute) {
                 foreach ($attribute as $value) {
@@ -319,7 +363,7 @@ class Loader extends BaseObject
                     } else if ($value instanceof Set) {
                         $annotation->addSets($class::class, $value->name, $name);
                     } else {
-                        $value->execute([$class, $name]);
+                        $value->execute($class, $name);
                     }
                 }
             }
@@ -327,4 +371,16 @@ class Loader extends BaseObject
     }
 
 
+    /**
+     * @param $class
+     * @return object
+     * @throws \ReflectionException
+     * @throws \Snowflake\Exception\NotFindClassException
+     */
+    private function newInstance($class)
+    {
+        $reflection = Snowflake::getDi()->getReflect($class);
+        return $reflection->newInstance();
+    }
+
 }

Annotation/LocalService.php

@@ -35,21 +35,20 @@ use Snowflake\Snowflake;
 
 
     /**
-	 * @param array $handler
+     * @param object $class
+     * @param string $method
      * @return mixed
-	 * @throws Exception
+     * @throws \Exception
      */
-	public function execute(array $handler): mixed
+    public function execute(mixed $class, mixed $method = null): mixed
     {
-		$class = ['class' => $handler[0]::class];
+        $class = ['class' => $class::class];
         if (!empty($this->args)) {
             $class = array_merge($class, $this->args);
         }
 
         Snowflake::set($this->service, $class);
-
+        return true; // TODO: Change the autogenerated stub
-		return parent::execute($handler); // TODO: Change the autogenerated stub
     }
 
-
 }

Annotation/Model/Get.php

@@ -7,6 +7,7 @@ namespace Annotation\Model;
 use Annotation\Annotation;
 use Attribute;
 use Database\ActiveRecord;
+use Snowflake\Snowflake;
 
 
 /**
@@ -21,9 +22,7 @@ use Database\ActiveRecord;
      * Get constructor.
      * @param string $name
      */
-	public function __construct(
+    public function __construct(public string $name)
-		public string $name
-	)
     {
     }
 
@@ -32,12 +31,11 @@ use Database\ActiveRecord;
      * @param array $handler
      * @return ActiveRecord
      */
-	public function execute(array $handler): ActiveRecord
+    public function execute(mixed $class, mixed $method = null): bool
     {
-		/** @var ActiveRecord $activeRecord */
+        $annotation = Snowflake::getAnnotation();
-		[$activeRecord, $method] = $handler;
+        $annotation->addGets($class::class, $this->name, $method);
-
+        return true;
-		return $activeRecord->addGets($this->name, $method);
     }
 
 

Annotation/Model/Relation.php

@@ -7,6 +7,7 @@ namespace Annotation\Model;
 use Annotation\Attribute;
 use Database\ActiveRecord;
 use JetBrains\PhpStorm\Pure;
+use Snowflake\Snowflake;
 
 
 /**
@@ -30,13 +31,10 @@ use JetBrains\PhpStorm\Pure;
 	 * @param array $handler
 	 * @return bool
 	 */
-	public function execute(array $handler): bool
+    public function execute(mixed $class, mixed $method = null): bool
 	{
-		/** @var ActiveRecord $activeRecord */
+        $annotation = Snowflake::getAnnotation();
-		[$activeRecord, $method] = $handler;
+        $annotation->addRelate($class::class, $this->name, $method);
-
-		$activeRecord->setRelate($this->name, $method);
-
         return true;
 	}
 

Annotation/Model/Set.php

@@ -6,6 +6,7 @@ namespace Annotation\Model;
 
 use Annotation\Attribute;
 use Database\ActiveRecord;
+use Snowflake\Snowflake;
 
 #[\Attribute(\Attribute::TARGET_METHOD)] class Set extends Attribute
 {
@@ -20,17 +21,17 @@ use Database\ActiveRecord;
 	}
 
 
-
     /**
-	 * @param array $handler
+     * @param mixed $class
-	 * @return ActiveRecord
+     * @param mixed|null $method
+     * @return bool
+     * @throws \Exception
      */
-	public function execute(array $handler): ActiveRecord
+    public function execute(mixed $class, mixed $method = null): bool
 	{
-		/** @var ActiveRecord $activeRecord */
+        $annotation = Snowflake::getAnnotation();
-		[$activeRecord, $method] = $handler;
+        $annotation->addSets($class::class, $this->name, $method);
-
+		return true;
-		return $activeRecord->addSets($this->name, $method);
 	}
 
 

Annotation/Port.php

@@ -31,14 +31,14 @@ use Snowflake\Snowflake;
 	 * @return mixed
 	 * @throws Exception
 	 */
-	public function execute(array $handler): mixed
+    public function execute(mixed $class, mixed $method = null): mixed
 	{
 		$router = Snowflake::app()->getRouter();
-		if (!($handler[0] instanceof Porters)) {
+		if (!($class instanceof Porters)) {
 			return true;
 		}
-		$router->addPortListen($this->port, [$handler[0], 'process']);
+		$router->addPortListen($this->port, [$class, 'process']);
-		return parent::execute($handler);
+		return true;
 	}
 
 }

Annotation/Route/After.php

@@ -38,7 +38,7 @@ use Snowflake\Snowflake;
 	 * @param array $handler
 	 * @return After
 	 */
-	public function execute(array $handler): static
+	public function execute(mixed $class, mixed $method = null): static
 	{
 		return $this;
 	}

Annotation/Route/Document.php

@@ -38,7 +38,7 @@ use Annotation\Attribute;
 	 * @param array $handler
 	 * @return array
 	 */
-	public function execute(array $handler): array
+    public function execute(mixed $class, mixed $method = null): array
 	{
 		// TODO: Implement execute() method.
 		return [$this->request, $this->response];

Annotation/Route/Filter.php

@@ -33,7 +33,7 @@ use Snowflake\Snowflake;
 	 * @return bool
 	 * @throws Exception
 	 */
-	public function execute(array $handler): bool
+    public function execute(mixed $class, mixed $method = null): bool
 	{
 		return true;
 	}

Annotation/Route/Interceptor.php

@@ -43,7 +43,7 @@ use Snowflake\Snowflake;
 	 * @param array $handler
 	 * @return Interceptor
 	 */
-	public function execute(array $handler): static
+    public function execute(mixed $class, mixed $method = null): static
 	{
 		return $this;
 	}

Annotation/Route/Limits.php

@@ -42,7 +42,7 @@ use Snowflake\Snowflake;
 	 * @param array $handler
 	 * @return Limits
 	 */
-	public function execute(array $handler): static
+    public function execute(mixed $class, mixed $method = null): static
 	{
 		return $this;
 	}

Annotation/Route/Middleware.php

@@ -43,7 +43,7 @@ use HttpServer\IInterface\Middleware as IMiddleware;
 	 * @param array $handler
 	 * @return Middleware
 	 */
-	public function execute(array $handler): static
+    public function execute(mixed $class, mixed $method = null): static
 	{
 		return $this;
 	}

Annotation/Route/Route.php

@@ -34,12 +34,12 @@ use Snowflake\Snowflake;
 	 * @throws ConfigException
 	 * @throws Exception
 	 */
-	public function execute(array $handler): Router
+    public function execute(mixed $class, mixed $method = null): Router
 	{
 		// TODO: Implement setHandler() method.
 		$router = Snowflake::app()->getRouter();
 
-		$router->addRoute($this->uri, $handler, $this->method);
+		$router->addRoute($this->uri, [$class, $method], $this->method);
 
 		return $router;
 	}

Annotation/Route/RpcProducer.php

@@ -42,12 +42,12 @@ use Snowflake\Snowflake;
 	 * @return Router
 	 * @throws Exception
 	 */
-	public function execute(array $handler): Router
+    public function execute(mixed $class, mixed $method = null): Router
 	{
 		// TODO: Implement setHandler() method.
 		$router = Snowflake::app()->getRouter();
 
-		$router->addRoute($this->uri, $handler, Request::HTTP_CMD)
+		$router->addRoute($this->uri, [$class, $method], Request::HTTP_CMD)
 			->setDataType($this->protocol);
 
 		return $router;

Annotation/Route/Socket.php

@@ -44,14 +44,14 @@ use Snowflake\Snowflake;
 	 * @return Router
 	 * @throws Exception
 	 */
-	public function execute(array $handler): Router
+    public function execute(mixed $class, mixed $method = null): Router
 	{
 		// TODO: Implement setHandler() method.
 		$router = Snowflake::app()->getRouter();
 
 		$method = $this->event . '::' . (is_null($this->uri) ? 'event' : $this->uri);
 
-		$router->addRoute($method, $handler, 'sw::socket');
+		$router->addRoute($method, [$class, $method], 'sw::socket');
 
 		return $router;
 	}

Annotation/Rpc/Consumer.php

@@ -32,11 +32,11 @@ use Snowflake\Snowflake;
 	 * @return mixed
 	 * @throws Exception
 	 */
-	public function execute(array $handler): mixed
+    public function execute(mixed $class, mixed $method = ''): mixed
 	{
 		$rpc = Snowflake::app()->getRpc();
-		$rpc->addConsumer($this->cmd, $handler);
+		$rpc->addConsumer($this->cmd, [$class, $method]);
-		return parent::execute($handler); // TODO: Change the autogenerated stub
+		return true; // TODO: Change the autogenerated stub
 	}
 
 

Annotation/Rpc/RpcClient.php

@@ -42,12 +42,12 @@ use Snowflake\Snowflake;
      * @return mixed
      * @throws Exception
      */
-	public function execute(array $handler): mixed
+    public function execute(mixed $class, mixed $method = ''): mixed
     {
         $rpc = Snowflake::app()->getRpc();
-		$rpc->addProducer($this->cmd, $handler, $this->config);
+        $rpc->addProducer($this->cmd, [$class, $method], $this->config);
 
-		return parent::execute($handler);
+        return true;
     }