eee

src/Validator/ValidatorMiddleware.php

@@ -3,7 +3,7 @@ declare(strict_types=1);
 
 namespace Kiri\Router\Validator;
 
-use Kiri\Di\Inject\Container;
+use Kiri\Router\Base\Middleware;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
@@ -16,16 +16,6 @@ class ValidatorMiddleware implements MiddlewareInterface
 {
 
 
-    public Validator $validator;
-
-
-    /**
-     * @var ResponseInterface
-     */
-    #[Container(ResponseInterface::class)]
-    public ResponseInterface $response;
-
-
     /**
      * @param ServerRequestInterface $request
      * @param RequestHandlerInterface $handler
@@ -34,8 +24,9 @@ class ValidatorMiddleware implements MiddlewareInterface
      */
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
-        if (!$this->validator->run($request)) {
-            return $this->response->html($this->validator->error(), 415);
+        $validator = Middleware::getValidator($request->getMethod() . '::' . $request->getUri()->getPath());
+        if (!$validator->run($request)) {
+            return di(ResponseInterface::class)->html($validator->error(), 415);
         } else {
             return $handler->handle($request);
         }