Remove unecessary validation

By requiring PHP 8.3 we no longer need to have two different exceptions to handle. Signed-off-by: Luís Cobucci <[email protected]>
lcobucci · Sep 24, 2024 · 4012dd8 · 4012dd8
1 parent da6201e
commit 4012dd8
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 39 deletions.
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -3,18 +3,3 @@ parameters:
     paths:
         - src
         - test
-
-    ignoreErrors:
-        # This is only for PHP 8.2 compatibility
-        -
-         message: "#^PHPDoc tag @throws with type DateMalformedStringException\\|InvalidArgumentException is not subtype of Throwable$#"
-         count: 1
-         path: src/FrozenClock.php
-        -
-         message: "#^Class DateMalformedStringException not found\\.$#"
-         count: 1
-         path: test/FrozenClockTest.php
-        -
-         message: "#^Parameter \\#1 \\$exception of method PHPUnit\\\\Framework\\\\TestCase\\:\\:expectException\\(\\) expects class\\-string\\<Throwable\\>, string given\\.$#"
-         count: 1
-         path: test/FrozenClockTest.php
diff --git a/src/FrozenClock.php b/src/FrozenClock.php
@@ -6,7 +6,6 @@
 use DateMalformedStringException;
 use DateTimeImmutable;
 use DateTimeZone;
-use InvalidArgumentException;
 
 final class FrozenClock implements Clock
 {
@@ -29,19 +28,11 @@ public function setTo(DateTimeImmutable $now): void
      *
      * @param string $modifier @see https://www.php.net/manual/en/datetime.formats.php
      *
-     * @throws InvalidArgumentException When an invalid format string is passed (PHP < 8.3).
-     * @throws DateMalformedStringException When an invalid date/time string is passed (PHP 8.3+).
+     * @throws DateMalformedStringException When an invalid date/time string is passed.
      */
     public function adjustTime(string $modifier): void
     {
-        $modifiedTime = @$this->now->modify($modifier);
-
-        // PHP < 8.3 won't throw exceptions on invalid modifiers
-        if ($modifiedTime === false) {
-            throw new InvalidArgumentException('The given modifier is invalid');
-        }
-
-        $this->now = $modifiedTime;
+        $this->now = $this->now->modify($modifier);
     }
 
     public function now(): DateTimeImmutable

diff --git a/test/FrozenClockTest.php b/test/FrozenClockTest.php
@@ -5,9 +5,7 @@
 
 use DateMalformedStringException;
 use DateTimeImmutable;
-use InvalidArgumentException;
 use PHPUnit\Framework\Attributes\CoversClass;
-use PHPUnit\Framework\Attributes\RequiresPhp;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 
@@ -57,17 +55,6 @@ public function adjustTimeChangesTheObject(): void
     }
 
     #[Test]
-    #[RequiresPhp('< 8.3.0')]
-    public function adjustTimeThrowsForInvalidModifierInPhp82(): void
-    {
-        $clock = FrozenClock::fromUTC();
-
-        $this->expectException(InvalidArgumentException::class);
-        $clock->adjustTime('invalid');
-    }
-
-    #[Test]
-    #[RequiresPhp('>= 8.3.0')]
     public function adjustTimeThrowsForInvalidModifier(): void
     {
         $clock = FrozenClock::fromUTC();