Merge pull request #35 from PhantPHP/fix-dateinterval

Fix date interval
PhantPHP · Jun 20, 2024 · 99aa932 · 99aa932
2 parents ae4fdfd + fc3475e
commit 99aa932
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 0 deletions.
diff --git a/component/Time/DateInterval.php b/component/Time/DateInterval.php
@@ -22,6 +22,9 @@ public function __construct(
         if (!$from && !$to) {
             throw new NotCompliant('Date intervals: from ' . $from . ' to' . $to);
         }
+        if ($from && $to && $from->time > $to->time) {
+            throw new NotCompliant('From can be after To : ' . $from . '/' . $to);
+        }
 
         $this->calculateDuration();
     }

diff --git a/component/Time/DateTimeInterval.php b/component/Time/DateTimeInterval.php
@@ -22,6 +22,9 @@ public function __construct(
         if (!$from && !$to) {
             throw new NotCompliant('Date time intervals: from ' . $from . ' to' . $to);
         }
+        if ($from && $to && $from->time > $to->time) {
+            throw new NotCompliant('From can be after To : ' . $from . '/' . $to);
+        }
 
         $this->calculateDuration();
     }

diff --git a/test/Time/DateIntervalTest.php b/test/Time/DateIntervalTest.php
@@ -252,4 +252,14 @@ public function testNotCompliant(): void
 
         new DateInterval(null, null);
     }
+
+    public function testNotCompliantDateInvert(): void
+    {
+        $this->expectException(NotCompliant::class);
+
+        DateInterval::make(
+            '1970-01-01',
+            '1954-06-07'
+        );
+    }
 }
diff --git a/test/Time/DateTimeIntervalTest.php b/test/Time/DateTimeIntervalTest.php
@@ -252,4 +252,14 @@ public function testNotCompliant(): void
 
         new DateTimeInterval(null, null);
     }
+
+    public function testNotCompliantDateInvert(): void
+    {
+        $this->expectException(NotCompliant::class);
+
+        DateTimeInterval::make(
+            '1970-01-01 00:00:00',
+            '1954-06-07 12:34:56'
+        );
+    }
 }