This commit is contained in:
xl
2023-11-09 17:04:46 +08:00
parent 284d5bdbf9
commit 472210b158
2 changed files with 57 additions and 47 deletions
+2 -2
View File
@@ -28,7 +28,7 @@ class BindForm implements InjectParameterInterface
* @throws ReflectionException * @throws ReflectionException
* @throws Exception * @throws Exception
*/ */
public function dispatch(string $class, string $method): mixed public function dispatch(string $class, string $method): object
{ {
$validator = new Validator(); $validator = new Validator();
$reflect = \Kiri::getDi()->getReflectionClass($this->formValidate); $reflect = \Kiri::getDi()->getReflectionClass($this->formValidate);
@@ -51,7 +51,7 @@ class BindForm implements InjectParameterInterface
$manager = \Kiri::getDi()->get(Middleware::class); $manager = \Kiri::getDi()->get(Middleware::class);
$manager->set($class, $method, $middleware); $manager->set($class, $method, $middleware);
return $validator; return $validator->getFormData();
} }
} }
+12 -2
View File
@@ -4,6 +4,7 @@ declare(strict_types=1);
namespace Kiri\Router\Validator; namespace Kiri\Router\Validator;
use Exception; use Exception;
use Kiri\Di\Inject\Container;
use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Message\ServerRequestInterface;
use Psr\Http\Server\MiddlewareInterface; use Psr\Http\Server\MiddlewareInterface;
@@ -19,6 +20,12 @@ class ValidatorMiddleware implements MiddlewareInterface
public Validator $validator; public Validator $validator;
/**
* @var ResponseInterface
*/
#[Container(ResponseInterface::class)]
public ResponseInterface $response;
/** /**
* @param ServerRequestInterface $request * @param ServerRequestInterface $request
@@ -28,8 +35,11 @@ class ValidatorMiddleware implements MiddlewareInterface
*/ */
public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
{ {
$this->validator->bindData($request); $validator = $this->validator->bindData($request);
if (!$validator->run($request)) {
return $this->response->html('400 Bad Request', 400);
} else {
return $handler->handle($request); return $handler->handle($request);
} }
} }
}