变更

src/ActionManager.php

@@ -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;
-	}
-
-
-}

src/Aspect.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router;
 

src/Aspect/AbstractsAspect.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Aspect;
 

src/Aspect/JoinPoint.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Aspect;
 

src/Aspect/OnAspectInterface.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Aspect;
 

src/Aspect/OnJoinPointInterface.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Aspect;
 

src/Aspect/TestAspect.php

@@ -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;
-	}
-
-}

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;

src/Base/ClosureController.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Base;
 

src/Base/CoreMiddleware.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Base;
 

src/Base/EventDispatchHelper.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Base;
 

src/Base/ExceptionHandlerDispatcher.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Base;
 

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.");
 	}
 }

src/Base/Middleware.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Base;
 

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.");
 	}
 
 }

src/Constrict/ConstrictRequest.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Constrict;
 

src/Constrict/ConstrictResponse.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Constrict;
 

src/Constrict/Message.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Constrict;
 

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'
+		};
+	}
+
+
+}

src/Constrict/Stream.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Constrict;
 

src/Constrict/Uri.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Constrict;
 

src/ContentType.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router;
 

src/ControllerInterpreter.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router;
 

src/DataGrip.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router;
 

src/Handler.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router;
 

src/HttpRequestHandler.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router;
 

src/HttpResponseEmitter.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router;
 

src/Inject/AbstractRequestMethod.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Inject;
 

src/Inject/Aspect.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Inject;
 

src/Inject/Controller.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Inject;
 

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;

src/Inject/Filter.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Inject;
 

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;

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;

src/Inject/Interceptor.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Inject;
 

src/Inject/Middleware.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Inject;
 

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;

src/Inject/Other.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Inject;
 

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;

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;

src/Inject/QueryData.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Inject;
 

src/Interface/ExceptionHandlerInterface.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Interface;
 

src/Interface/InjectRouteInterface.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router;
 

src/Interface/OnRequestInterface.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Interface;
 

src/Interface/ValidatorInterface.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Interface;
 

src/Request.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router;
 

src/Response.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router;
 

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';

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;
 
 
 /**

src/Server.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router;
 

src/StreamResponse.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router;
 

src/Validator/Inject/Email.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Validator\Inject;
 

src/Validator/Inject/Ignore.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Validator\Inject;
 

src/Validator/Inject/In.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Validator\Inject;
 

src/Validator/Inject/Length.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Validator\Inject;
 

src/Validator/Inject/Max.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Validator\Inject;
 

src/Validator/Inject/MaxLength.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Validator\Inject;
 

src/Validator/Inject/Min.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Validator\Inject;
 

src/Validator/Inject/MinLength.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Validator\Inject;
 

src/Validator/Inject/Must.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Validator\Inject;
 

src/Validator/Inject/NotEmpty.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Validator\Inject;
 

src/Validator/Inject/NotIn.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Validator\Inject;
 

src/Validator/Inject/NotNull.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Validator\Inject;
 

src/Validator/Inject/Phone.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Validator\Inject;
 

src/Validator/Inject/Required.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Validator\Inject;
 

src/Validator/Inject/Round.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Validator\Inject;
 

src/Validator/Validator.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Validator;
 

src/Validator/ValidatorMiddleware.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kiri\Router\Validator;