Refactored TimeAgo.php and added test

SerhiiCho · Jan 16, 2022 · 235feee · 235feee
1 parent 7199031
commit 235feee
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/src/Exceptions/WrongDateFormatException.php → ...Exceptions/InvalidDateFormatException.php b/src/Exceptions/WrongDateFormatException.php → ...Exceptions/InvalidDateFormatException.php
@@ -6,7 +6,7 @@
 
 use Exception;
 
-class WrongDateFormatException extends Exception
+class InvalidDateFormatException extends Exception
 {
     //
 }
diff --git a/src/TimeAgo.php b/src/TimeAgo.php
@@ -5,8 +5,9 @@
 namespace Serhii\Ago;
 
 use Carbon\CarbonImmutable;
+use Carbon\Exceptions\InvalidFormatException;
+use Serhii\Ago\Exceptions\InvalidDateFormatException;
 use Serhii\Ago\Exceptions\MissingRuleException;
-use Serhii\Ago\Exceptions\WrongDateFormatException;
 
 final class TimeAgo
 {
@@ -40,19 +41,22 @@ public static function singleton(): self
      *
      * @return string
      * @throws \Serhii\Ago\Exceptions\MissingRuleException
-     * @throws \Serhii\Ago\Exceptions\WrongDateFormatException
+     * @throws \Serhii\Ago\Exceptions\InvalidDateFormatException
      */
     public static function trans($date, $options = []): string
     {
         if (\is_int($options)) {
             $options = [$options];
         }
 
-        /** @phpstan-ignore-next-line */
-        $timestamp = CarbonImmutable::parse($date)->timestamp;
-
-        if (!\is_int($timestamp)) {
-            throw new WrongDateFormatException("Cannot convert date to a timestamp");
+        try {
+            /**
+             * @phpstan-ignore-next-line
+             * @var int $timestamp
+             */
+            $timestamp = CarbonImmutable::parse($date)->timestamp;
+        } catch (InvalidFormatException $e) {
+            throw new InvalidDateFormatException($e->getMessage());
         }
 
         return self::singleton()->handle($timestamp, $options);

diff --git a/tests/TimeAgoTest.php b/tests/TimeAgoTest.php
@@ -9,6 +9,7 @@
 use Carbon\CarbonInterface;
 use DateTimeInterface;
 use PHPUnit\Framework\TestCase;
+use Serhii\Ago\Exceptions\InvalidDateFormatException;
 use Serhii\Ago\Lang;
 use Serhii\Ago\TimeAgo;
 
@@ -123,4 +124,11 @@ public function provider_for_trans_method_returns_correct_result_after_passing_a
             [Carbon::now()->subMonths(8), '8 months ago'],
         ];
     }
+
+    /** @test */
+    public function trans_method_throws_exception_if_input_has_incorrect_string(): void
+    {
+        $this->expectException(InvalidDateFormatException::class);
+        TimeAgo::trans('sfdafsd');
+    }
 }