Display next due time correctly for sub-minute events

laravel · Jul 12, 2023 · 07033bd · 07033bd
1 parent a7244f4
commit 07033bd
Showing 1 changed file with 21 additions and 1 deletion.
diff --git a/src/Illuminate/Console/Scheduling/ScheduleListCommand.php b/src/Illuminate/Console/Scheduling/ScheduleListCommand.php
@@ -164,11 +164,31 @@ private function sortEvents(\Illuminate\Support\Collection $events, DateTimeZone
      */
     private function getNextDueDateForEvent($event, DateTimeZone $timezone)
     {
-        return Carbon::instance(
+        $nextDueDate = Carbon::instance(
             (new CronExpression($event->expression))
                 ->getNextRunDate(Carbon::now()->setTimezone($event->timezone))
                 ->setTimezone($timezone)
         );
+
+        if (! $event->isRepeatable()) {
+            return $nextDueDate;
+        }
+
+        $previousDueDate = Carbon::instance(
+            (new CronExpression($event->expression))
+                ->getPreviousRunDate(Carbon::now()->setTimezone($event->timezone), allowCurrentDate: true)
+                ->setTimezone($timezone)
+        );
+
+        $now = Carbon::now()->setTimezone($event->timezone);
+
+        if (! $now->copy()->startOfMinute()->eq($previousDueDate)) {
+            return $nextDueDate;
+        }
+
+        return $now
+            ->endOfSecond()
+            ->ceilSeconds($event->repeatSeconds);
     }
 
     /**