diff --git a/src/Base/Middleware.php b/src/Base/Middleware.php index 465e3a5..9b57a24 100644 --- a/src/Base/Middleware.php +++ b/src/Base/Middleware.php @@ -21,7 +21,6 @@ class Middleware */ public function __construct() { - $this->routeMap = new HashMap(); $this->map = new HashMap(); } diff --git a/src/Validator/BindForm.php b/src/Validator/BindForm.php index aaaf0e0..86fe9d3 100644 --- a/src/Validator/BindForm.php +++ b/src/Validator/BindForm.php @@ -2,6 +2,7 @@ namespace Kiri\Router\Validator; +use Exception; use Kiri\Di\Interface\InjectParameterInterface; use Kiri\Router\Base\Middleware; use Kiri\Router\Interface\ValidatorInterface; @@ -25,6 +26,7 @@ class BindForm implements InjectParameterInterface * @param string $method * @return mixed * @throws ReflectionException + * @throws Exception */ public function dispatch(string $class, string $method): mixed { @@ -40,8 +42,11 @@ class BindForm implements InjectParameterInterface } } + $middleware = new ValidatorMiddleware(); + $middleware->validator = $validator; + $manager = \Kiri::getDi()->get(Middleware::class); - $manager->set($class, $method, ValidatorMiddleware::class, [$validator]); + $manager->set($class, $method, $middleware); return $validator; } diff --git a/src/Validator/ValidatorMiddleware.php b/src/Validator/ValidatorMiddleware.php index b522af9..cee04ac 100644 --- a/src/Validator/ValidatorMiddleware.php +++ b/src/Validator/ValidatorMiddleware.php @@ -16,7 +16,7 @@ class ValidatorMiddleware implements MiddlewareInterface { - readonly public Validator $validator; + public Validator $validator;