diff --git a/app/Models/Validation/Messages/UpperRangeInformativeValidator.php b/app/Models/Validation/Messages/NextInformativeValidator.php similarity index 54% rename from app/Models/Validation/Messages/UpperRangeInformativeValidator.php rename to app/Models/Validation/Messages/NextInformativeValidator.php index 77999ca..c830c10 100644 --- a/app/Models/Validation/Messages/UpperRangeInformativeValidator.php +++ b/app/Models/Validation/Messages/NextInformativeValidator.php @@ -3,16 +3,15 @@ namespace App\Models\Validation\Messages; use App\Models\Validation\Messages\InformativeValidator; -use App\Models\Validation\Validators\UpperRangeValidator; +use App\Models\Validation\Validators\Validator; -class UpperRangeInformativeValidator extends InformativeValidator { +class NextInformativeValidator extends InformativeValidator { protected InformativeValidator $nextValidator; - public function __construct(string $message, UpperRangeValidator $validator, InformativeValidator $nextValidator) + public function __construct(string $message, Validator $validator, InformativeValidator $nextValidator) { $this->setMessage($message); $this->setValidator($validator); $this->nextValidator = $nextValidator; } } - diff --git a/tests/Unit/Validation/Messages/UpperRangeInformativeValidatorTest.php b/tests/Unit/Validation/Messages/UpperRangeInformativeValidatorTest.php index 670a351..584498a 100644 --- a/tests/Unit/Validation/Messages/UpperRangeInformativeValidatorTest.php +++ b/tests/Unit/Validation/Messages/UpperRangeInformativeValidatorTest.php @@ -4,10 +4,11 @@ namespace Tests\Unit; use PHPUnit\Framework\TestCase; -use App\Models\Validation\Messages\UpperRangeInformativeValidator; +use App\Models\Validation\Messages\NextInformativeValidator; use App\Models\Validation\Messages\OkInformativeValidator; use App\Models\Validation\Validators\UpperRangeValidator; use App\Models\Validation\Validators\OkValidator; +use App\Models\Validation\Validators\Validator; class UpperRangeInformativeValidatorTest extends TestCase { @@ -45,11 +46,11 @@ class UpperRangeInformativeValidatorTest extends TestCase ]; } - public function setUpValidator(int $value, int $rangeLimit): UpperRangeInformativeValidator + public function setUpValidator(int $value, int $rangeLimit): NextInformativeValidator { $upperRangeValidator = new UpperRangeValidator($value, $rangeLimit, new OkValidator()); - return new UpperRangeInformativeValidator( + return new NextInformativeValidator( $this->messages['error'], $upperRangeValidator, new OkInformativeValidator($this->messages['ok']),