From 91af6b3a5f42c6cf7eb51b3770e8ccfa0add70ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=91=E6=9E=97?= <as2252258@163.com>
Date: Sun, 16 Apr 2023 01:24:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/ActionManager.php                       | 41 ---------------------
 src/Aspect.php                              |  1 +
 src/Aspect/AbstractsAspect.php              |  1 +
 src/Aspect/JoinPoint.php                    |  1 +
 src/Aspect/OnAspectInterface.php            |  1 +
 src/Aspect/OnJoinPointInterface.php         |  1 +
 src/Aspect/TestAspect.php                   | 25 -------------
 src/Base/AbstractHandler.php                |  2 +-
 src/Base/ClosureController.php              |  1 +
 src/Base/CoreMiddleware.php                 |  1 +
 src/Base/EventDispatchHelper.php            |  1 +
 src/Base/ExceptionHandlerDispatcher.php     |  1 +
 src/Base/MethodErrorController.php          |  6 ++-
 src/Base/Middleware.php                     |  1 +
 src/Base/NotFoundController.php             |  6 ++-
 src/Constrict/ConstrictRequest.php          |  1 +
 src/Constrict/ConstrictResponse.php         |  1 +
 src/Constrict/Message.php                   |  1 +
 src/Constrict/RequestMethod.php             | 35 ++++++++++++++++++
 src/Constrict/Stream.php                    |  1 +
 src/Constrict/Uri.php                       |  1 +
 src/ContentType.php                         |  1 +
 src/ControllerInterpreter.php               |  1 +
 src/DataGrip.php                            |  1 +
 src/Handler.php                             |  1 +
 src/HttpRequestHandler.php                  |  1 +
 src/HttpResponseEmitter.php                 |  1 +
 src/Inject/AbstractRequestMethod.php        |  1 +
 src/Inject/Aspect.php                       |  1 +
 src/Inject/Controller.php                   |  1 +
 src/Inject/Delete.php                       |  3 +-
 src/Inject/Filter.php                       |  1 +
 src/Inject/Get.php                          |  3 +-
 src/Inject/Head.php                         |  3 +-
 src/Inject/Interceptor.php                  |  1 +
 src/Inject/Middleware.php                   |  1 +
 src/Inject/Options.php                      |  3 +-
 src/Inject/Other.php                        |  1 +
 src/Inject/Post.php                         |  3 +-
 src/Inject/Put.php                          |  3 +-
 src/Inject/QueryData.php                    |  1 +
 src/Interface/ExceptionHandlerInterface.php |  1 +
 src/Interface/InjectRouteInterface.php      |  1 +
 src/Interface/OnRequestInterface.php        |  1 +
 src/Interface/ValidatorInterface.php        |  1 +
 src/Request.php                             |  1 +
 src/Response.php                            |  1 +
 src/Router.php                              |  3 +-
 src/RouterCollector.php                     |  4 +-
 src/Server.php                              |  1 +
 src/StreamResponse.php                      |  1 +
 src/Validator/Inject/Email.php              |  1 +
 src/Validator/Inject/Ignore.php             |  1 +
 src/Validator/Inject/In.php                 |  1 +
 src/Validator/Inject/Length.php             |  1 +
 src/Validator/Inject/Max.php                |  1 +
 src/Validator/Inject/MaxLength.php          |  1 +
 src/Validator/Inject/Min.php                |  1 +
 src/Validator/Inject/MinLength.php          |  1 +
 src/Validator/Inject/Must.php               |  1 +
 src/Validator/Inject/NotEmpty.php           |  1 +
 src/Validator/Inject/NotIn.php              |  1 +
 src/Validator/Inject/NotNull.php            |  1 +
 src/Validator/Inject/Phone.php              |  1 +
 src/Validator/Inject/Required.php           |  1 +
 src/Validator/Inject/Round.php              |  1 +
 src/Validator/Validator.php                 |  1 +
 src/Validator/ValidatorMiddleware.php       |  1 +
 68 files changed, 115 insertions(+), 79 deletions(-)
 delete mode 100644 src/ActionManager.php
 delete mode 100644 src/Aspect/TestAspect.php
 create mode 100644 src/Constrict/RequestMethod.php

diff --git a/src/ActionManager.php b/src/ActionManager.php
deleted file mode 100644
index 12938b3..0000000
--- a/src/ActionManager.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-namespace Kiri\Router;
-
-class ActionManager
-{
-
-
-	private static array $array = [];
-
-
-	/**
-	 * @param string $class
-	 * @param string $method
-	 * @param Handler $handler
-	 * @return void
-	 */
-	public static function add(string $class, string $method, Handler $handler): void
-	{
-		if (!isset(static::$array[$class])) {
-			static::$array[$class] = [$method => []];
-		}
-		static::$array[$class][$method] = $handler;
-	}
-
-
-	/**
-	 * @param string $class
-	 * @param string $method
-	 * @return array|null
-	 */
-	public static function get(string $class, string $method): ?Handler
-	{
-		if (isset(static::$array[$class])) {
-			return static::$array[$class][$method] ?? null;
-		}
-		return null;
-	}
-
-
-}
diff --git a/src/Aspect.php b/src/Aspect.php
index 0eca0a2..4b354e0 100644
--- a/src/Aspect.php
+++ b/src/Aspect.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router;
 
diff --git a/src/Aspect/AbstractsAspect.php b/src/Aspect/AbstractsAspect.php
index c4e1e42..f36275b 100644
--- a/src/Aspect/AbstractsAspect.php
+++ b/src/Aspect/AbstractsAspect.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Aspect;
 
diff --git a/src/Aspect/JoinPoint.php b/src/Aspect/JoinPoint.php
index 35044dc..3f8bac7 100644
--- a/src/Aspect/JoinPoint.php
+++ b/src/Aspect/JoinPoint.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Aspect;
 
diff --git a/src/Aspect/OnAspectInterface.php b/src/Aspect/OnAspectInterface.php
index f80782e..2d08177 100644
--- a/src/Aspect/OnAspectInterface.php
+++ b/src/Aspect/OnAspectInterface.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Aspect;
 
diff --git a/src/Aspect/OnJoinPointInterface.php b/src/Aspect/OnJoinPointInterface.php
index cdc22bc..a4b4f02 100644
--- a/src/Aspect/OnJoinPointInterface.php
+++ b/src/Aspect/OnJoinPointInterface.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Aspect;
 
diff --git a/src/Aspect/TestAspect.php b/src/Aspect/TestAspect.php
deleted file mode 100644
index 6a045f1..0000000
--- a/src/Aspect/TestAspect.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-namespace Kiri\Router\Aspect;
-
-
-
-class TestAspect extends AbstractsAspect
-{
-
-
-	/**
-	 * @param OnJoinPointInterface $joinPoint
-	 * @return mixed
-	 */
-	public function process(OnJoinPointInterface $joinPoint): mixed
-	{
-
-		$result = $joinPoint->process();
-
-		var_dump('111');
-
-		return  $result;
-	}
-
-}
diff --git a/src/Base/AbstractHandler.php b/src/Base/AbstractHandler.php
index 61d9b44..b351068 100644
--- a/src/Base/AbstractHandler.php
+++ b/src/Base/AbstractHandler.php
@@ -1,8 +1,8 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Base;
 
-use Kiri\Inject\Route\TestResponse;
 use Kiri\Router\Handler;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
diff --git a/src/Base/ClosureController.php b/src/Base/ClosureController.php
index 8660402..a529cb9 100644
--- a/src/Base/ClosureController.php
+++ b/src/Base/ClosureController.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Base;
 
diff --git a/src/Base/CoreMiddleware.php b/src/Base/CoreMiddleware.php
index 17e1457..8de0ac3 100644
--- a/src/Base/CoreMiddleware.php
+++ b/src/Base/CoreMiddleware.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Base;
 
diff --git a/src/Base/EventDispatchHelper.php b/src/Base/EventDispatchHelper.php
index 54b931d..e0766fb 100644
--- a/src/Base/EventDispatchHelper.php
+++ b/src/Base/EventDispatchHelper.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Base;
 
diff --git a/src/Base/ExceptionHandlerDispatcher.php b/src/Base/ExceptionHandlerDispatcher.php
index cf5b9cf..be0ad9a 100644
--- a/src/Base/ExceptionHandlerDispatcher.php
+++ b/src/Base/ExceptionHandlerDispatcher.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Base;
 
diff --git a/src/Base/MethodErrorController.php b/src/Base/MethodErrorController.php
index 034ae10..e347779 100644
--- a/src/Base/MethodErrorController.php
+++ b/src/Base/MethodErrorController.php
@@ -1,8 +1,10 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Base;
 
-use Kiri\Message\Constrict\ResponseInterface;
+
+use Psr\Http\Message\ResponseInterface;
 
 class MethodErrorController extends Controller
 {
@@ -13,6 +15,6 @@ class MethodErrorController extends Controller
 	 */
 	public function fail(): ResponseInterface
 	{
-		return $this->response->failure(405, "method allow.");
+		return $this->response->withStatus(405, "method allow.");
 	}
 }
diff --git a/src/Base/Middleware.php b/src/Base/Middleware.php
index 668e1a5..65de3ed 100644
--- a/src/Base/Middleware.php
+++ b/src/Base/Middleware.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Base;
 
diff --git a/src/Base/NotFoundController.php b/src/Base/NotFoundController.php
index cd95c5b..4ca7ca0 100644
--- a/src/Base/NotFoundController.php
+++ b/src/Base/NotFoundController.php
@@ -1,8 +1,10 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Base;
 
-use Kiri\Message\Constrict\ResponseInterface;
+
+use Psr\Http\Message\ResponseInterface;
 
 class NotFoundController extends Controller
 {
@@ -13,7 +15,7 @@ class NotFoundController extends Controller
 	 */
 	public function fail(): ResponseInterface
 	{
-		return $this->response->failure(404, "not found page.");
+		return $this->response->withStatus(404, "not found page.");
 	}
 
 }
diff --git a/src/Constrict/ConstrictRequest.php b/src/Constrict/ConstrictRequest.php
index cdf6c11..dd75819 100644
--- a/src/Constrict/ConstrictRequest.php
+++ b/src/Constrict/ConstrictRequest.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Constrict;
 
diff --git a/src/Constrict/ConstrictResponse.php b/src/Constrict/ConstrictResponse.php
index 2f4f554..3b60eae 100644
--- a/src/Constrict/ConstrictResponse.php
+++ b/src/Constrict/ConstrictResponse.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Constrict;
 
diff --git a/src/Constrict/Message.php b/src/Constrict/Message.php
index edf610e..1e28f76 100644
--- a/src/Constrict/Message.php
+++ b/src/Constrict/Message.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Constrict;
 
diff --git a/src/Constrict/RequestMethod.php b/src/Constrict/RequestMethod.php
new file mode 100644
index 0000000..e7744f1
--- /dev/null
+++ b/src/Constrict/RequestMethod.php
@@ -0,0 +1,35 @@
+<?php
+declare(strict_types=1);
+
+namespace Kiri\Router\Constrict;
+
+enum RequestMethod
+{
+
+
+
+	case REQUEST_POST;
+	case REQUEST_GET;
+	case REQUEST_HEAD;
+	case REQUEST_OPTIONS;
+	case REQUEST_DELETE;
+	case REQUEST_PUT;
+
+
+	/**
+	 * @return string
+	 */
+	public function getString(): string
+	{
+		return match ($this) {
+			self::REQUEST_POST => 'POST',
+			self::REQUEST_GET => 'GET',
+			self::REQUEST_HEAD => 'HEAD',
+			self::REQUEST_OPTIONS => 'OPTIONS',
+			self::REQUEST_DELETE => 'DELETE',
+			self::REQUEST_PUT => 'PUT'
+		};
+	}
+
+
+}
diff --git a/src/Constrict/Stream.php b/src/Constrict/Stream.php
index e9ab05c..ec6d050 100644
--- a/src/Constrict/Stream.php
+++ b/src/Constrict/Stream.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Constrict;
 
diff --git a/src/Constrict/Uri.php b/src/Constrict/Uri.php
index b3ba980..381c31d 100644
--- a/src/Constrict/Uri.php
+++ b/src/Constrict/Uri.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Constrict;
 
diff --git a/src/ContentType.php b/src/ContentType.php
index 71d7d20..89fa923 100644
--- a/src/ContentType.php
+++ b/src/ContentType.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router;
 
diff --git a/src/ControllerInterpreter.php b/src/ControllerInterpreter.php
index 2ceaa57..92f6945 100644
--- a/src/ControllerInterpreter.php
+++ b/src/ControllerInterpreter.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router;
 
diff --git a/src/DataGrip.php b/src/DataGrip.php
index 5db0167..112dcb4 100644
--- a/src/DataGrip.php
+++ b/src/DataGrip.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router;
 
diff --git a/src/Handler.php b/src/Handler.php
index 7ac0db6..148ba7b 100644
--- a/src/Handler.php
+++ b/src/Handler.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router;
 
diff --git a/src/HttpRequestHandler.php b/src/HttpRequestHandler.php
index 796a463..8caa6cc 100644
--- a/src/HttpRequestHandler.php
+++ b/src/HttpRequestHandler.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router;
 
diff --git a/src/HttpResponseEmitter.php b/src/HttpResponseEmitter.php
index 4df4f27..c98fc40 100644
--- a/src/HttpResponseEmitter.php
+++ b/src/HttpResponseEmitter.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router;
 
diff --git a/src/Inject/AbstractRequestMethod.php b/src/Inject/AbstractRequestMethod.php
index b115937..4d7869b 100644
--- a/src/Inject/AbstractRequestMethod.php
+++ b/src/Inject/AbstractRequestMethod.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Inject;
 
diff --git a/src/Inject/Aspect.php b/src/Inject/Aspect.php
index 3d65c36..243937a 100644
--- a/src/Inject/Aspect.php
+++ b/src/Inject/Aspect.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Inject;
 
diff --git a/src/Inject/Controller.php b/src/Inject/Controller.php
index bdc895b..add2c4b 100644
--- a/src/Inject/Controller.php
+++ b/src/Inject/Controller.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Inject;
 
diff --git a/src/Inject/Delete.php b/src/Inject/Delete.php
index b3fbf72..386f370 100644
--- a/src/Inject/Delete.php
+++ b/src/Inject/Delete.php
@@ -1,9 +1,10 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Inject;
 
 use Exception;
-use Kiri\Annotation\Route\RequestMethod;
+use Kiri\Router\Constrict\RequestMethod;
 use Kiri\Router\InjectRouteInterface;
 use Kiri\Router\Router;
 use ReflectionException;
diff --git a/src/Inject/Filter.php b/src/Inject/Filter.php
index 75c58c4..5f9e773 100644
--- a/src/Inject/Filter.php
+++ b/src/Inject/Filter.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Inject;
 
diff --git a/src/Inject/Get.php b/src/Inject/Get.php
index 069318d..3a6395e 100644
--- a/src/Inject/Get.php
+++ b/src/Inject/Get.php
@@ -1,9 +1,10 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Inject;
 
 use Exception;
-use Kiri\Annotation\Route\RequestMethod;
+use Kiri\Router\Constrict\RequestMethod;
 use Kiri\Router\InjectRouteInterface;
 use Kiri\Router\Router;
 use ReflectionException;
diff --git a/src/Inject/Head.php b/src/Inject/Head.php
index afb91a8..e0b786e 100644
--- a/src/Inject/Head.php
+++ b/src/Inject/Head.php
@@ -1,9 +1,10 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Inject;
 
 use Exception;
-use Kiri\Annotation\Route\RequestMethod;
+use Kiri\Router\Constrict\RequestMethod;
 use Kiri\Router\InjectRouteInterface;
 use Kiri\Router\Router;
 use ReflectionException;
diff --git a/src/Inject/Interceptor.php b/src/Inject/Interceptor.php
index 65e9685..15ee9de 100644
--- a/src/Inject/Interceptor.php
+++ b/src/Inject/Interceptor.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Inject;
 
diff --git a/src/Inject/Middleware.php b/src/Inject/Middleware.php
index a5706b0..a280848 100644
--- a/src/Inject/Middleware.php
+++ b/src/Inject/Middleware.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Inject;
 
diff --git a/src/Inject/Options.php b/src/Inject/Options.php
index 001d8e5..170054a 100644
--- a/src/Inject/Options.php
+++ b/src/Inject/Options.php
@@ -1,9 +1,10 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Inject;
 
 use Exception;
-use Kiri\Annotation\Route\RequestMethod;
+use Kiri\Router\Constrict\RequestMethod;
 use Kiri\Router\InjectRouteInterface;
 use Kiri\Router\Router;
 use ReflectionException;
diff --git a/src/Inject/Other.php b/src/Inject/Other.php
index 8f5f521..4dd64b8 100644
--- a/src/Inject/Other.php
+++ b/src/Inject/Other.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Inject;
 
diff --git a/src/Inject/Post.php b/src/Inject/Post.php
index 4feb289..19dc28b 100644
--- a/src/Inject/Post.php
+++ b/src/Inject/Post.php
@@ -1,9 +1,10 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Inject;
 
 use Exception;
-use Kiri\Annotation\Route\RequestMethod;
+use Kiri\Router\Constrict\RequestMethod;
 use Kiri\Router\InjectRouteInterface;
 use Kiri\Router\Router;
 use ReflectionException;
diff --git a/src/Inject/Put.php b/src/Inject/Put.php
index 7a2401f..dd1a50e 100644
--- a/src/Inject/Put.php
+++ b/src/Inject/Put.php
@@ -1,9 +1,10 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Inject;
 
 use Exception;
-use Kiri\Annotation\Route\RequestMethod;
+use Kiri\Router\Constrict\RequestMethod;
 use Kiri\Router\InjectRouteInterface;
 use Kiri\Router\Router;
 use Kiri\Router\Base\Middleware as MiddlewareManager;
diff --git a/src/Inject/QueryData.php b/src/Inject/QueryData.php
index 002431d..23ba254 100644
--- a/src/Inject/QueryData.php
+++ b/src/Inject/QueryData.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Inject;
 
diff --git a/src/Interface/ExceptionHandlerInterface.php b/src/Interface/ExceptionHandlerInterface.php
index ccd03f4..df117b8 100644
--- a/src/Interface/ExceptionHandlerInterface.php
+++ b/src/Interface/ExceptionHandlerInterface.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Interface;
 
diff --git a/src/Interface/InjectRouteInterface.php b/src/Interface/InjectRouteInterface.php
index 961c04a..4f01f27 100644
--- a/src/Interface/InjectRouteInterface.php
+++ b/src/Interface/InjectRouteInterface.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router;
 
diff --git a/src/Interface/OnRequestInterface.php b/src/Interface/OnRequestInterface.php
index 5259a70..df96715 100644
--- a/src/Interface/OnRequestInterface.php
+++ b/src/Interface/OnRequestInterface.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Interface;
 
diff --git a/src/Interface/ValidatorInterface.php b/src/Interface/ValidatorInterface.php
index 406a3cb..214ae23 100644
--- a/src/Interface/ValidatorInterface.php
+++ b/src/Interface/ValidatorInterface.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Interface;
 
diff --git a/src/Request.php b/src/Request.php
index fa7afa1..82b0cee 100644
--- a/src/Request.php
+++ b/src/Request.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router;
 
diff --git a/src/Response.php b/src/Response.php
index be39dd6..e67f225 100644
--- a/src/Response.php
+++ b/src/Response.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router;
 
diff --git a/src/Router.php b/src/Router.php
index c1ae932..0c1d097 100644
--- a/src/Router.php
+++ b/src/Router.php
@@ -1,11 +1,12 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router;
 
 use Closure;
 use Exception;
 use Kiri;
-use Kiri\Annotation\Route\RequestMethod;
+use Kiri\Router\Constrict\RequestMethod;
 use ReflectionException;
 
 const ROUTER_TYPE_HTTP = 'http';
diff --git a/src/RouterCollector.php b/src/RouterCollector.php
index ec923b8..7d7e60c 100644
--- a/src/RouterCollector.php
+++ b/src/RouterCollector.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Kiri\Router;
 
 
@@ -7,12 +9,12 @@ use Closure;
 use Exception;
 use Kiri;
 use Kiri\Router\Base\NotFoundController;
+use Kiri\Router\Constrict\RequestMethod;
 use ReflectionException;
 use Throwable;
 use Traversable;
 use Kiri\Router\Base\Middleware;
 use Kiri\Core\HashMap;
-use Kiri\Annotation\Route\RequestMethod;
 
 
 /**
diff --git a/src/Server.php b/src/Server.php
index a035cf2..6b77040 100644
--- a/src/Server.php
+++ b/src/Server.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router;
 
diff --git a/src/StreamResponse.php b/src/StreamResponse.php
index e463d62..b8011b0 100644
--- a/src/StreamResponse.php
+++ b/src/StreamResponse.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router;
 
diff --git a/src/Validator/Inject/Email.php b/src/Validator/Inject/Email.php
index 4d6b735..e23f640 100644
--- a/src/Validator/Inject/Email.php
+++ b/src/Validator/Inject/Email.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Validator\Inject;
 
diff --git a/src/Validator/Inject/Ignore.php b/src/Validator/Inject/Ignore.php
index 4c2b325..13284c5 100644
--- a/src/Validator/Inject/Ignore.php
+++ b/src/Validator/Inject/Ignore.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Validator\Inject;
 
diff --git a/src/Validator/Inject/In.php b/src/Validator/Inject/In.php
index 948d085..a2dc2d0 100644
--- a/src/Validator/Inject/In.php
+++ b/src/Validator/Inject/In.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Validator\Inject;
 
diff --git a/src/Validator/Inject/Length.php b/src/Validator/Inject/Length.php
index cadee43..9c46536 100644
--- a/src/Validator/Inject/Length.php
+++ b/src/Validator/Inject/Length.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Validator\Inject;
 
diff --git a/src/Validator/Inject/Max.php b/src/Validator/Inject/Max.php
index d62eb73..533be88 100644
--- a/src/Validator/Inject/Max.php
+++ b/src/Validator/Inject/Max.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Validator\Inject;
 
diff --git a/src/Validator/Inject/MaxLength.php b/src/Validator/Inject/MaxLength.php
index 8c88c4a..0fde4cc 100644
--- a/src/Validator/Inject/MaxLength.php
+++ b/src/Validator/Inject/MaxLength.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Validator\Inject;
 
diff --git a/src/Validator/Inject/Min.php b/src/Validator/Inject/Min.php
index 3ff21f0..f6b7b98 100644
--- a/src/Validator/Inject/Min.php
+++ b/src/Validator/Inject/Min.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Validator\Inject;
 
diff --git a/src/Validator/Inject/MinLength.php b/src/Validator/Inject/MinLength.php
index 3c53391..0eaaf53 100644
--- a/src/Validator/Inject/MinLength.php
+++ b/src/Validator/Inject/MinLength.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Validator\Inject;
 
diff --git a/src/Validator/Inject/Must.php b/src/Validator/Inject/Must.php
index 8719fcc..7045e5e 100644
--- a/src/Validator/Inject/Must.php
+++ b/src/Validator/Inject/Must.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Validator\Inject;
 
diff --git a/src/Validator/Inject/NotEmpty.php b/src/Validator/Inject/NotEmpty.php
index aabc741..37cc838 100644
--- a/src/Validator/Inject/NotEmpty.php
+++ b/src/Validator/Inject/NotEmpty.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Validator\Inject;
 
diff --git a/src/Validator/Inject/NotIn.php b/src/Validator/Inject/NotIn.php
index dc260d0..2216e85 100644
--- a/src/Validator/Inject/NotIn.php
+++ b/src/Validator/Inject/NotIn.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Validator\Inject;
 
diff --git a/src/Validator/Inject/NotNull.php b/src/Validator/Inject/NotNull.php
index c8e0f11..e9d3de5 100644
--- a/src/Validator/Inject/NotNull.php
+++ b/src/Validator/Inject/NotNull.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Validator\Inject;
 
diff --git a/src/Validator/Inject/Phone.php b/src/Validator/Inject/Phone.php
index 2ca7b31..cf8eb85 100644
--- a/src/Validator/Inject/Phone.php
+++ b/src/Validator/Inject/Phone.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Validator\Inject;
 
diff --git a/src/Validator/Inject/Required.php b/src/Validator/Inject/Required.php
index f58940f..97893cf 100644
--- a/src/Validator/Inject/Required.php
+++ b/src/Validator/Inject/Required.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Validator\Inject;
 
diff --git a/src/Validator/Inject/Round.php b/src/Validator/Inject/Round.php
index 259c6f9..c4cebb1 100644
--- a/src/Validator/Inject/Round.php
+++ b/src/Validator/Inject/Round.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Validator\Inject;
 
diff --git a/src/Validator/Validator.php b/src/Validator/Validator.php
index 8842643..faea431 100644
--- a/src/Validator/Validator.php
+++ b/src/Validator/Validator.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Validator;
 
diff --git a/src/Validator/ValidatorMiddleware.php b/src/Validator/ValidatorMiddleware.php
index 7e05a5a..e390c73 100644
--- a/src/Validator/ValidatorMiddleware.php
+++ b/src/Validator/ValidatorMiddleware.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Validator;