diff --git a/app/Models/Validation/Validators/OkValidator.php b/app/Models/Validation/Validators/OkValidator.php index cbdcad6..1b11063 100644 --- a/app/Models/Validation/Validators/OkValidator.php +++ b/app/Models/Validation/Validators/OkValidator.php @@ -2,9 +2,14 @@ namespace App\Models\Validation\Validators; -use App\Models\Validation\Validators\ValidationInterface; +use App\Models\Validation\Validators\Validator; + +class OkValidator extends Validator { + public function isCurrentValid(): bool + { + return true; + } -class OkValidator implements ValidationInterface { public function isValid(): bool { return true; diff --git a/app/Models/Validation/Validators/UpperRangeValidator.php b/app/Models/Validation/Validators/UpperRangeValidator.php index 8b9cd12..bcdb0f0 100644 --- a/app/Models/Validation/Validators/UpperRangeValidator.php +++ b/app/Models/Validation/Validators/UpperRangeValidator.php @@ -2,15 +2,14 @@ namespace App\Models\Validation\Validators; -use App\Models\Validation\Validators\ValidationInterface; -use App\Models\Validation\Validators\ValidationTrait; +use App\Models\Validation\Validators\Validator; -class UpperRangeValidator implements ValidationInterface { - private ValidationInterface $nextValidator; +class UpperRangeValidator extends Validator { private int $value; private int $rangeLimit; + protected Validator $nextValidator; - public function __construct(int $value, int $rangeLimit, ValidationInterface $nextValidator) + public function __construct(int $value, int $rangeLimit, Validator $nextValidator) { $this->value = $value; $this->rangeLimit = $rangeLimit; @@ -24,10 +23,5 @@ class UpperRangeValidator implements ValidationInterface { return true; } - - public function isValid(): bool - { - return $this->isCurrentValid() && $this->nextValidator->isValid(); - } } diff --git a/app/Models/Validation/Validators/Validator.php b/app/Models/Validation/Validators/Validator.php new file mode 100644 index 0000000..5ec1476 --- /dev/null +++ b/app/Models/Validation/Validators/Validator.php @@ -0,0 +1,13 @@ +isCurrentValid() && $this->nextValidator->isValid(); + } +} +