变更

src/Validator/BindForm.php

@@ -3,6 +3,7 @@
 namespace Kiri\Router\Validator;
 
 use Kiri\Di\Interface\InjectParameterInterface;
+use Kiri\Router\Base\Middleware;
 use Kiri\Router\Interface\ValidatorInterface;
 use ReflectionException;
 
@@ -24,6 +25,7 @@ class BindForm implements InjectParameterInterface
 	 * @param string $method
 	 * @return mixed
 	 * @throws ReflectionException
+	 * @throws \Exception
 	 */
 	public function dispatch(object $class, string $method): mixed
 	{
@@ -38,6 +40,10 @@ class BindForm implements InjectParameterInterface
 				}
 			}
 		}
+
+		$manager = \Kiri::getDi()->get(Middleware::class);
+		$manager->set($class::class, $method, ValidatorMiddleware::class, [$validator]);
+
 		return $validator;
 	}
 

src/Validator/ValidatorMiddleware.php

@@ -3,41 +3,33 @@ declare(strict_types=1);
 
 namespace Kiri\Router\Validator;
 
-use Kiri\Di\Context;
-use Kiri\Router\Constrict\Stream;
+use Exception;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 
+/**
+ *
+ */
 class ValidatorMiddleware implements MiddlewareInterface
 {
 
 
-	/**
-	 * @param Validator $validator
-	 */
-	public function __construct(readonly public Validator $validator)
-	{
-	}
+	readonly public Validator $validator;
+
 
 
 	/**
 	 * @param ServerRequestInterface $request
 	 * @param RequestHandlerInterface $handler
 	 * @return ResponseInterface
+	 * @throws Exception
 	 */
 	public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
 	{
-		try {
-			$this->validator->bindData($request);
-			return $handler->handle($request);
-		} catch (\Throwable $throwable) {
-			/** @var ResponseInterface $response */
-			$response = Context::get(ResponseInterface::class);
-			$response->withStatus(407)->withBody(new Stream($throwable->getMessage()));
-			return $response;
-		}
-	}
+		$this->validator->bindData($request);
 
+		return $handler->handle($request);
+	}
 }