fix: correct age calculation and improve code formatting (#405)

SonyPradana · Dec 30, 2024 · e8f833a · e8f833a
1 parent c7da7b6
commit e8f833a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/System/Time/Now.php b/src/System/Time/Now.php
@@ -62,7 +62,7 @@ public function __construct(string $date_format = 'now', ?string $time_zone = nu
         if (null !== $time_zone) {
             $time_zone = new \DateTimeZone($time_zone);
         }
-        $this->date = new \DateTime($date_format, $time_zone);
+        $this->date     = new \DateTime($date_format, $time_zone);
 
         $this->refresh();
     }
@@ -126,8 +126,9 @@ private function refresh(): void
         $this->timeZone  = $this->date->format('e');
         $this->shortDay  = $this->date->format('D');
 
-        $age       = time() - $this->date->getTimestamp();
-        $this->age = abs(floor($age / (365 * 60 * 60 * 24)));
+        $now       = new \DateTime('now', new \DateTimeZone($this->timeZone));
+        $interval  = $now->diff($this->date);
+        $this->age = $interval->y;
     }
 
     private function current(string $format, int $timestamp): string

diff --git a/tests/Time/TimeTravelTest.php b/tests/Time/TimeTravelTest.php
@@ -155,9 +155,11 @@ public function itSameWithCustumeTime(): void
      */
     public function itCorrectAge(): void
     {
-        $now = new Now('01/01/2000');
+        $now         = new Now('01/01/2000');
+        $currentYear = (int) date('Y');
+        $expectedAge = $currentYear - 2000;
         $this->assertSame(
-            24.0,
+            $expectedAge,
             $now->age,
             'the age must equal'
         );