diff --git a/src/Validator/BindForm.php b/src/Validator/BindForm.php index 86fe9d3..f8dafb9 100644 --- a/src/Validator/BindForm.php +++ b/src/Validator/BindForm.php @@ -42,12 +42,6 @@ class BindForm implements InjectParameterInterface } } - $middleware = new ValidatorMiddleware(); - $middleware->validator = $validator; - - $manager = \Kiri::getDi()->get(Middleware::class); - $manager->set($class, $method, $middleware); - return $validator; } diff --git a/src/Validator/Validator.php b/src/Validator/Validator.php index 95ed783..4395b2f 100644 --- a/src/Validator/Validator.php +++ b/src/Validator/Validator.php @@ -72,10 +72,12 @@ class Validator /** + * @param ServerRequestInterface|Request $request * @return bool */ - public function run(): bool + public function run(ServerRequestInterface|Request $request): bool { + $this->bindData($request); foreach ($this->rules as $name => $rule) { if (!$rule->dispatch($this->formData, $name)) { return false;