diff --git a/tests/Rule/Date/DateTimeTest.php b/tests/Rule/Date/DateTimeTest.php index 2a16c88a6..e6c41d738 100644 --- a/tests/Rule/Date/DateTimeTest.php +++ b/tests/Rule/Date/DateTimeTest.php @@ -7,7 +7,6 @@ use DateTimeImmutable; use DateTimeZone; use Yiisoft\Validator\Rule\Date\DateTime; -use Yiisoft\Validator\Rule\Date\Date; use Yiisoft\Validator\Rule\Date\DateTimeHandler; use Yiisoft\Validator\Tests\Rule\Base\RuleTestCase; use Yiisoft\Validator\Tests\Rule\Base\SkipOnErrorTestTrait; @@ -20,7 +19,7 @@ final class DateTimeTest extends RuleTestCase public function testGetName(): void { - $rule = new Date(); + $rule = new DateTime(); $this->assertSame('date', $rule->getName()); } @@ -97,14 +96,14 @@ public static function dataValidationFailed(): array public function testSkipOnError(): void { - $this->testSkipOnErrorInternal(new Date(), new Date(skipOnError: true)); + $this->testSkipOnErrorInternal(new DateTime(), new DateTime(skipOnError: true)); } public function testWhen(): void { $this->testWhenInternal( - new Date(), - new Date( + new DateTime(), + new DateTime( when: static fn(mixed $value): bool => $value !== null, ), ); diff --git a/tests/Rule/Date/TimeTest.php b/tests/Rule/Date/TimeTest.php index cf649f616..f6cef1821 100644 --- a/tests/Rule/Date/TimeTest.php +++ b/tests/Rule/Date/TimeTest.php @@ -8,7 +8,6 @@ use DateTimeZone; use IntlDateFormatter; use Yiisoft\Validator\Rule\Date\Time; -use Yiisoft\Validator\Rule\Date\Date; use Yiisoft\Validator\Rule\Date\TimeHandler; use Yiisoft\Validator\Tests\Rule\Base\RuleTestCase; use Yiisoft\Validator\Tests\Rule\Base\SkipOnErrorTestTrait; @@ -21,7 +20,7 @@ final class TimeTest extends RuleTestCase public function testGetName(): void { - $rule = new Date(); + $rule = new Time(); $this->assertSame('date', $rule->getName()); } @@ -98,14 +97,14 @@ public static function dataValidationFailed(): array public function testSkipOnError(): void { - $this->testSkipOnErrorInternal(new Date(), new Date(skipOnError: true)); + $this->testSkipOnErrorInternal(new Time(), new Time(skipOnError: true)); } public function testWhen(): void { $this->testWhenInternal( - new Date(), - new Date( + new Time(), + new Time( when: static fn(mixed $value): bool => $value !== null, ), ); diff --git a/tests/Rule/NumberTest.php b/tests/Rule/NumberTest.php index ade27cac4..dac163370 100644 --- a/tests/Rule/NumberTest.php +++ b/tests/Rule/NumberTest.php @@ -44,6 +44,12 @@ public function testGetName(): void $this->assertSame(Number::class, $rule->getName()); } + public function testIntegerGetName(): void + { + $rule = new Integer(); + $this->assertSame(Integer::class, $rule->getName()); + } + public static function dataOptions(): array { return [ @@ -312,9 +318,20 @@ public function testSkipOnError(): void $this->testSkipOnErrorInternal(new Number(), new Number(skipOnError: true)); } + public function testIntegerSkipOnError(): void + { + $this->testSkipOnErrorInternal(new Integer(), new Integer(skipOnError: true)); + } + public function testWhen(): void { $when = static fn(mixed $value): bool => $value !== null; $this->testWhenInternal(new Number(), new Number(when: $when)); } + + public function testIntegerWhen(): void + { + $when = static fn(mixed $value): bool => $value !== null; + $this->testWhenInternal(new Integer(), new Integer(when: $when)); + } }