Fixed distance backward in time period

aeon-php · May 28, 2020 · 6f40f9a · 6f40f9a
1 parent 8f8e258
commit 6f40f9a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/Aeon/Calendar/Gregorian/TimePeriod.php b/src/Aeon/Calendar/Gregorian/TimePeriod.php
@@ -34,8 +34,10 @@ public function distance() : TimeUnit
 
     public function distanceBackward() : TimeUnit
     {
-        return TimeUnit::seconds(
-            $this->start->secondsSinceUnixEpoch() - $this->end->secondsSinceUnixEpoch()
+        return TimeUnit::precise(
+            (float) \sprintf("%d.%s", $this->start->secondsSinceUnixEpoch(), \str_pad((string) $this->start->time()->microsecond(), 6, "0", STR_PAD_LEFT))
+            -
+            (float) \sprintf("%d.%s", $this->end->secondsSinceUnixEpoch(), \str_pad((string) $this->end->time()->microsecond(), 6, "0", STR_PAD_LEFT))
         );
     }
 

diff --git a/tests/Aeon/Calendar/Tests/Unit/Gregorian/TimePeriodTest.php b/tests/Aeon/Calendar/Tests/Unit/Gregorian/TimePeriodTest.php
@@ -23,7 +23,7 @@ public function test_distance_in_time_unit_from_start_to_end_date() : void
         $this->assertFalse($period->distance()->isNegative());
     }
 
-    public function test_precide_distance_in_time_unit_from_start_to_end() : void
+    public function test_precise_distance_in_time_unit_from_start_to_end() : void
     {
         $period = new TimePeriod(
             DateTime::fromString('2020-01-01 12:25:30.079635'),
@@ -33,6 +33,16 @@ public function test_precide_distance_in_time_unit_from_start_to_end() : void
         $this->assertSame("2.508825", $period->distance()->inSecondsPreciseString());
     }
 
+    public function test_precise_distance_in_time_unit_from_start_to_end_backward() : void
+    {
+        $period = new TimePeriod(
+            DateTime::fromString('2020-01-01 12:25:30.079635'),
+            DateTime::fromString('2020-01-01 12:25:32.588460')
+        );
+
+        $this->assertSame("-2.508825", $period->distanceBackward()->inSecondsPreciseString());
+    }
+
     public function test_distance_in_time_unit_from_start_to_end_date_between_years() : void
     {
         $period = new TimePeriod(