改名

Annotation/Aspect.php

@@ -28,9 +28,10 @@ defined('ASPECT_ERROR') or define('ASPECT_ERROR', 'Aspect annotation must implem
     }
 
 
-
+	/**
-
+	 * @throws Exception
-    public function execute(mixed $class, mixed $method = ''): mixed
+	 */
+	public function execute(mixed $class, mixed $method = ''): bool
     {
         // TODO: Change the autogenerated stub
         if (!in_array(IAspect::class, class_implements($this->aspect))) {

Annotation/Asynchronous.php

@@ -29,11 +29,12 @@ use Snowflake\Snowflake;
 
 
 	/**
-	 * @param array $handler
+	 * @param mixed $class
+	 * @param mixed|null $method
 	 * @return bool
 	 * @throws Exception
 	 */
-    public function execute(mixed $class, mixed $method = null): mixed
+    public function execute(mixed $class, mixed $method = null): bool
     {
 		$async = Snowflake::app()->getAsync();
 		$async->addAsync($this->name, $class);

Annotation/Event.php

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

Annotation/IAnnotation.php

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

Annotation/Inject.php

@@ -5,6 +5,7 @@ namespace Annotation;
 
 
 use Exception;
+use ReflectionException;
 use ReflectionProperty;
 use Snowflake\Snowflake;
 
@@ -27,11 +28,13 @@ use Snowflake\Snowflake;
 
 
 	/**
-     * @param array $handler
+	 * @param mixed $class
-     * @return mixed
+	 * @param mixed|null $method
+	 * @return bool
+	 * @throws ReflectionException
 	 * @throws Exception
 	 */
-    public function execute(mixed $class, mixed $method = null): mixed
+    public function execute(mixed $class, mixed $method = null): bool
     {
         $injectValue = $this->parseInjectValue();
         if (!($method instanceof ReflectionProperty)) {

Annotation/Kafka.php

@@ -4,6 +4,7 @@
 namespace Annotation;
 
 
+use Exception;
 use Kafka\ConsumerInterface;
 use Kafka\TaskContainer;
 use Snowflake\Snowflake;
@@ -27,10 +28,12 @@ use Snowflake\Snowflake;
 
 
 	/**
-     * @param array $handler
+	 * @param mixed $class
-     * @return mixed
+	 * @param mixed|null $method
+	 * @return bool
+	 * @throws Exception
 	 */
-    public function execute(mixed $class, mixed $method = null): mixed
+    public function execute(mixed $class, mixed $method = null): bool
     {
         if (!($class instanceof ConsumerInterface)) {
             return false;

Annotation/Loader.php

@@ -10,8 +10,11 @@ use Annotation\Model\Set;
 use Attribute;
 use DirectoryIterator;
 use Exception;
+use ReflectionClass;
+use ReflectionException;
 use ReflectionMethod;
 use Snowflake\Abstracts\BaseObject;
+use Snowflake\Exception\NotFindClassException;
 use Snowflake\Snowflake;
 use Throwable;
 
@@ -30,6 +33,9 @@ class Loader extends BaseObject
 	private array $_directory = [];
 
 
+	private array $_annotationMaps = [];
+
+
 	/**
 	 * @return array
 	 */
@@ -183,24 +189,24 @@ class Loader extends BaseObject
 
 
 	/**
-     * @param string $path
+	 * @param DirectoryIterator $path
 	 * @param string $namespace
-     * @return \ReflectionClass|null
+	 * @return ReflectionClass|null
-     * @throws \ReflectionException
+	 * @throws ReflectionException
-     * @throws \Snowflake\Exception\NotFindClassException
+	 * @throws NotFindClassException
 	 */
-    private function getReflect(DirectoryIterator $path, string $namespace): ?\ReflectionClass
+	private function getReflect(DirectoryIterator $path, string $namespace): ?ReflectionClass
 	{
 		return Snowflake::getDi()->getReflect($this->explodeFileName($path, $namespace));
 	}
 
 
 	/**
-     * @param \ReflectionClass $replace
+	 * @param ReflectionClass $replace
 	 * @param array $_array
 	 * @return array
 	 */
-    private function _targets(\ReflectionClass $replace, array $_array): array
+	private function _targets(ReflectionClass $replace, array $_array): array
 	{
 		foreach ($replace->getAttributes() as $attribute) {
 			if ($attribute->getName() == Attribute::class) {
@@ -216,11 +222,11 @@ class Loader extends BaseObject
 
 
 	/**
-     * @param \ReflectionClass $replace
+	 * @param ReflectionClass $replace
 	 * @param array $_array
 	 * @return array
 	 */
-    private function _methods(\ReflectionClass $replace, array $_array): array
+	private function _methods(ReflectionClass $replace, array $_array): array
 	{
 		$methods = $replace->getMethods(ReflectionMethod::IS_PUBLIC);
 		foreach ($methods as $method) {
@@ -238,11 +244,11 @@ class Loader extends BaseObject
 
 
 	/**
-     * @param \ReflectionClass $replace
+	 * @param ReflectionClass $replace
 	 * @param array $_array
 	 * @return array
 	 */
-    private function _properties(\ReflectionClass $replace, array $_array): array
+	private function _properties(ReflectionClass $replace, array $_array): array
 	{
 		$methods = $replace->getProperties();
 		foreach ($methods as $method) {
@@ -317,6 +323,7 @@ class Loader extends BaseObject
 
 	/**
 	 * @param array $classes
+	 * @throws Exception
 	 */
 	private function execute(array $classes)
 	{
@@ -330,12 +337,22 @@ class Loader extends BaseObject
 			if ($annotations === null) {
 				continue;
 			}
-
-            /** @var \Annotation\Attribute $value */
-            foreach ($annotations['target'] ?? [] as $value) {
-                $value->execute($annotations['handler']);
-            }
 			foreach ($annotations['methods'] as $name => $attribute) {
+				$this->methods($annotations, $attribute, $annotation, $className, $name);
+			}
+		}
+	}
+
+
+	/**
+	 * @param $annotations
+	 * @param $attribute
+	 * @param $annotation
+	 * @param $className
+	 * @param $name
+	 */
+	private function methods($annotations, $attribute, $annotation, $className, $name)
+	{
 		foreach ($attribute as $value) {
 			if ($value instanceof Relation) {
 				$annotation->addRelate($className, $value->name, $name);
@@ -348,7 +365,5 @@ class Loader extends BaseObject
 			}
 		}
 	}
-        }
-    }
 
 }

Annotation/LocalService.php

@@ -37,10 +37,10 @@ use Snowflake\Snowflake;
     /**
      * @param object $class
      * @param string $method
-     * @return mixed
+     * @return bool
-     * @throws \Exception
+     * @throws Exception
      */
-    public function execute(mixed $class, mixed $method = null): mixed
+    public function execute(mixed $class, mixed $method = null): bool
     {
         $class = ['class' => $class::class];
         if (!empty($this->args)) {

Annotation/Model/Get.php

@@ -7,6 +7,7 @@ namespace Annotation\Model;
 use Annotation\Annotation;
 use Attribute;
 use Database\ActiveRecord;
+use Exception;
 use Snowflake\Snowflake;
 
 
@@ -28,8 +29,10 @@ use Snowflake\Snowflake;
 
 
 	/**
-     * @param array $handler
+	 * @param mixed $class
-     * @return ActiveRecord
+	 * @param mixed|null $method
+	 * @return bool
+	 * @throws Exception
 	 */
     public function execute(mixed $class, mixed $method = null): bool
     {

Annotation/Model/Relation.php

@@ -6,6 +6,7 @@ namespace Annotation\Model;
 
 use Annotation\Attribute;
 use Database\ActiveRecord;
+use Exception;
 use JetBrains\PhpStorm\Pure;
 use Snowflake\Snowflake;
 
@@ -28,8 +29,10 @@ use Snowflake\Snowflake;
 
 
 	/**
-	 * @param array $handler
+	 * @param mixed $class
+	 * @param mixed|null $method
 	 * @return bool
+	 * @throws Exception
 	 */
     public function execute(mixed $class, mixed $method = null): bool
 	{

Annotation/Model/Set.php

@@ -6,6 +6,7 @@ namespace Annotation\Model;
 
 use Annotation\Attribute;
 use Database\ActiveRecord;
+use Exception;
 use Snowflake\Snowflake;
 
 #[\Attribute(\Attribute::TARGET_METHOD)] class Set extends Attribute
@@ -25,7 +26,7 @@ use Snowflake\Snowflake;
      * @param mixed $class
      * @param mixed|null $method
      * @return bool
-     * @throws \Exception
+     * @throws Exception
      */
     public function execute(mixed $class, mixed $method = null): bool
 	{

Annotation/Route/Document.php

@@ -35,7 +35,8 @@ use Annotation\Attribute;
 
 
 	/**
-	 * @param array $handler
+	 * @param mixed $class
+	 * @param mixed|null $method
 	 * @return array
 	 */
     public function execute(mixed $class, mixed $method = null): array

Annotation/Route/Filter.php

@@ -29,9 +29,9 @@ use Snowflake\Snowflake;
 
 
 	/**
-	 * @param array $handler
+	 * @param mixed $class
+	 * @param mixed|null $method
 	 * @return bool
-	 * @throws Exception
 	 */
     public function execute(mixed $class, mixed $method = null): bool
 	{

Annotation/Route/Interceptor.php

@@ -21,7 +21,7 @@ use Snowflake\Snowflake;
 	 * @param string|array $interceptor
 	 * @throws
 	 */
-	#[Pure] public function __construct(public string|array $interceptor)
+	public function __construct(public string|array $interceptor)
 	{
 		if (is_string($this->interceptor)) {
 			$this->interceptor = [$this->interceptor];
@@ -40,7 +40,8 @@ use Snowflake\Snowflake;
 
 
 	/**
-	 * @param array $handler
+	 * @param mixed $class
+	 * @param mixed|null $method
 	 * @return Interceptor
 	 */
     public function execute(mixed $class, mixed $method = null): static

Annotation/Route/Limits.php

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

Annotation/Route/Middleware.php

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

Annotation/Route/Route.php

@@ -29,9 +29,9 @@ use Snowflake\Snowflake;
 
 
 	/**
-	 * @param array $handler
+	 * @param mixed $class
+	 * @param mixed|null $method
 	 * @return Router
-	 * @throws ConfigException
 	 * @throws Exception
 	 */
     public function execute(mixed $class, mixed $method = null): Router

Annotation/Route/RpcProducer.php

@@ -35,9 +35,9 @@ use Snowflake\Snowflake;
     }
 
 
-
 	/**
-     * @param array $handler
+	 * @param mixed $class
+	 * @param mixed|null $method
 	 * @return Router
 	 * @throws Exception
 	 */

Annotation/Rpc/Consumer.php

@@ -28,11 +28,12 @@ use Snowflake\Snowflake;
 
 
 	/**
-	 * @param array $handler
+	 * @param mixed $class
-	 * @return mixed
+	 * @param mixed $method
+	 * @return bool
 	 * @throws Exception
 	 */
-    public function execute(mixed $class, mixed $method = ''): mixed
+    public function execute(mixed $class, mixed $method = ''): bool
     {
 		$rpc = Snowflake::app()->getRpc();
 		$rpc->addConsumer($this->cmd, [$class, $method]);

Annotation/Rpc/RpcClient.php

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