fix: support for php82

BinarCode · Jul 2, 2024 · 6cab9f5 · 6cab9f5
1 parent a7553a4
commit 6cab9f5
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 13 deletions.
diff --git a/composer.json b/composer.json
@@ -43,7 +43,7 @@
     },
     "scripts": {
         "analyse": "vendor/bin/phpstan analyse",
-        "test": "./vendor/bin/testbench package:test --parallel --no-coverage",
+        "test": "./vendor/bin/testbench package:test --no-coverage",
         "test-coverage": "vendor/bin/phpunit --coverage-html coverage"
     },
     "config": {

diff --git a/src/Constraints/AfterConstraint.php b/src/Constraints/AfterConstraint.php
@@ -23,8 +23,8 @@ public function canSend(MailatorSchedule $schedule, Collection $logs): bool
             }
 
             return $schedule->isOnce()
-                ? $schedule->timestamp_target->diffInDays(now()->floorSeconds()) === $schedule->toDays()
-                : $schedule->timestamp_target->diffInDays(now()->floorSeconds()) > $schedule->toDays();
+                ? (int) $schedule->timestamp_target->diffInDays(now()->floorSeconds()) === $schedule->toDays()
+                : (int) $schedule->timestamp_target->diffInDays(now()->floorSeconds()) > $schedule->toDays();
         }
 
         if ($schedule->toHours() > 0) {
@@ -34,8 +34,8 @@ public function canSend(MailatorSchedule $schedule, Collection $logs): bool
 
             //till ends we should have at least toDays days
             return $schedule->isOnce()
-                ? $schedule->timestamp_target->diffInHours(now()->floorSeconds()) === $schedule->toHours()
-                : $schedule->timestamp_target->diffInHours(now()->floorSeconds()) > $schedule->toHours();
+                ? (int) $schedule->timestamp_target->diffInHours(now()->floorSeconds()) === $schedule->toHours()
+                : (int) $schedule->timestamp_target->diffInHours(now()->floorSeconds()) > $schedule->toHours();
         }
 
         if (now()->floorSeconds()->lte($schedule->timestampTarget()->addMinutes($schedule->delay_minutes))) {
@@ -44,7 +44,7 @@ public function canSend(MailatorSchedule $schedule, Collection $logs): bool
 
         //till ends we should have at least toDays days
         return $schedule->isOnce()
-            ? $schedule->timestamp_target->diffInHours(now()->floorSeconds()) === $schedule->delay_minutes
-            : $schedule->timestamp_target->diffInHours(now()->floorSeconds()) > $schedule->delay_minutes;
+            ? (int) $schedule->timestamp_target->diffInHours(now()->floorSeconds()) === $schedule->delay_minutes
+            : (int) $schedule->timestamp_target->diffInHours(now()->floorSeconds()) > $schedule->delay_minutes;
     }
 }
diff --git a/src/Constraints/BeforeConstraint.php b/src/Constraints/BeforeConstraint.php
@@ -29,8 +29,8 @@ public function canSend(MailatorSchedule $schedule, Collection $logs): bool
 
             //till ends we should have at least toDays days
             return $schedule->isOnce()
-                ? $schedule->timestampTarget()->diffInDays(now()->floorSeconds()) === $schedule->toDays()
-                : $schedule->timestampTarget()->diffInDays(now()->floorSeconds()) < $schedule->toDays();
+                ? (int) $schedule->timestampTarget()->diffInDays(now()->floorSeconds(), absolute: true) === $schedule->toDays()
+                : (int) $schedule->timestampTarget()->diffInDays(now()->floorSeconds(), absolute: true) < $schedule->toDays();
         }
 
         if ($schedule->toHours() > 0) {
@@ -40,15 +40,15 @@ public function canSend(MailatorSchedule $schedule, Collection $logs): bool
 
             //till ends we should have at least toHours days
             return $schedule->isOnce()
-                ? $schedule->timestamp_target->diffInHours(now()->floorSeconds()) === $schedule->toHours()
-                : $schedule->timestamp_target->diffInHours(now()->floorSeconds()) < $schedule->toHours();
+                ? (int) $schedule->timestamp_target->diffInHours(now()->floorSeconds(), absolute: true) === $schedule->toHours()
+                : (int) $schedule->timestamp_target->diffInHours(now()->floorSeconds(), absolute: true) < $schedule->toHours();
         }
 
 
 
         //till ends we should have at least toDays days
         return $schedule->isOnce()
-            ? $schedule->timestampTarget()->diffInDays(now()->floorSeconds()) === $schedule->toDays()
-            : $schedule->timestampTarget()->diffInDays(now()->floorSeconds()) < $schedule->toDays();
+            ? (int) $schedule->timestampTarget()->diffInDays(now()->floorSeconds(), absolute: true) === $schedule->toDays()
+            : (int) $schedule->timestampTarget()->diffInDays(now()->floorSeconds(), absolute: true) < $schedule->toDays();
     }
 }
diff --git a/tests/Feature/WithWeekendsConstraintTest.php b/tests/Feature/WithWeekendsConstraintTest.php
@@ -11,6 +11,19 @@
 
 class WithWeekendsConstraintTest extends TestCase
 {
+    protected function setUp(): void
+    {
+        parent::setUp();
+        TestTime::freeze();  // Freeze time at the beginning of each test
+    }
+
+    protected function tearDown(): void
+    {
+        TestTime::unfreeze();  // Unfreeze time after each test
+
+        parent::tearDown();
+    }
+
     public function test_can_send_mail_with_precision_at_the_given_hour(): void
     {
         Mail::fake();