[10.x] Adding Minutes Option in Some Frequencies (#47789)

* feat(frequencies): adding minutes option in some frequencies * test(frequencies): adding new tests * docs(types): adding types in some functions * formatting * test(frequencies): set default value * test(frequencies): dont use hourBaseSchedule function in hourly --------- Co-authored-by: Taylor Otwell <[email protected]>
laravel · Jul 28, 2023 · a54f988 · a54f988
1 parent 86d06a9
commit a54f988
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 23 deletions.
diff --git a/src/Illuminate/Console/Scheduling/ManagesFrequencies.php b/src/Illuminate/Console/Scheduling/ManagesFrequencies.php
@@ -250,68 +250,67 @@ public function hourly()
     /**
      * Schedule the event to run hourly at a given offset in the hour.
      *
-     * @param  array|int  $offset
+     * @param  array|string|int  $offset
      * @return $this
      */
     public function hourlyAt($offset)
     {
-        $offset = is_array($offset) ? implode(',', $offset) : $offset;
-
-        return $this->spliceIntoPosition(1, $offset);
+        return $this->hourBasedSchedule($offset, '*');
     }
 
     /**
      * Schedule the event to run every odd hour.
      *
+     * @param  array|string|int  $offset
      * @return $this
      */
-    public function everyOddHour()
+    public function everyOddHour($offset = 0)
     {
-        return $this->spliceIntoPosition(1, 0)->spliceIntoPosition(2, '1-23/2');
+        return $this->hourBasedSchedule($offset, '1-23/2');
     }
 
     /**
      * Schedule the event to run every two hours.
      *
+     * @param  array|string|int  $offset
      * @return $this
      */
-    public function everyTwoHours()
+    public function everyTwoHours($offset = 0)
     {
-        return $this->spliceIntoPosition(1, 0)
-                    ->spliceIntoPosition(2, '*/2');
+        return $this->hourBasedSchedule($offset, '*/2');
     }
 
     /**
      * Schedule the event to run every three hours.
      *
+     * @param  array|string|int  $offset
      * @return $this
      */
-    public function everyThreeHours()
+    public function everyThreeHours($offset = 0)
     {
-        return $this->spliceIntoPosition(1, 0)
-                    ->spliceIntoPosition(2, '*/3');
+        return $this->hourBasedSchedule($offset, '*/3');
     }
 
     /**
      * Schedule the event to run every four hours.
      *
+     * @param  array|string|int  $offset
      * @return $this
      */
-    public function everyFourHours()
+    public function everyFourHours($offset = 0)
     {
-        return $this->spliceIntoPosition(1, 0)
-                    ->spliceIntoPosition(2, '*/4');
+        return $this->hourBasedSchedule($offset, '*/4');
     }
 
     /**
      * Schedule the event to run every six hours.
      *
+     * @param  array|string|int  $offset
      * @return $this
      */
-    public function everySixHours()
+    public function everySixHours($offset = 0)
     {
-        return $this->spliceIntoPosition(1, 0)
-                    ->spliceIntoPosition(2, '*/6');
+        return $this->hourBasedSchedule($offset, '*/6');
     }
 
     /**
@@ -321,8 +320,7 @@ public function everySixHours()
      */
     public function daily()
     {
-        return $this->spliceIntoPosition(1, 0)
-                    ->spliceIntoPosition(2, 0);
+        return $this->hourBasedSchedule(0, 0);
     }
 
     /**
@@ -346,8 +344,10 @@ public function dailyAt($time)
     {
         $segments = explode(':', $time);
 
-        return $this->spliceIntoPosition(2, (int) $segments[0])
-                    ->spliceIntoPosition(1, count($segments) === 2 ? (int) $segments[1] : '0');
+        return $this->hourBasedSchedule(
+            count($segments) === 2 ? (int) $segments[1] : '0',
+            (int) $segments[0]
+        );
     }
 
     /**
@@ -374,7 +374,23 @@ public function twiceDailyAt($first = 1, $second = 13, $offset = 0)
     {
         $hours = $first.','.$second;
 
-        return $this->spliceIntoPosition(1, $offset)
+        return $this->hourBasedSchedule($offset, $hours);
+    }
+
+    /**
+     * Schedule the event to run at the given minutes and hours.
+     *
+     * @param  array|string|int  $minutes
+     * @param  array|string|int  $hours
+     * @return $this
+     */
+    protected function hourBasedSchedule($minutes, $hours)
+    {
+        $minutes = is_array($minutes) ? implode(',', $minutes) : $minutes;
+
+        $hours = is_array($hours) ? implode(',', $hours) : $hours;
+
+        return $this->spliceIntoPosition(1, $minutes)
                     ->spliceIntoPosition(2, $hours);
     }
 

diff --git a/tests/Console/Scheduling/FrequencyTest.php b/tests/Console/Scheduling/FrequencyTest.php
@@ -74,6 +74,7 @@ public function testOverrideWithHourly()
     {
         $this->assertSame('0 * * * *', $this->event->everyFiveMinutes()->hourly()->getExpression());
         $this->assertSame('37 * * * *', $this->event->hourlyAt(37)->getExpression());
+        $this->assertSame('*/10 * * * *', $this->event->hourlyAt('*/10')->getExpression());
         $this->assertSame('15,30,45 * * * *', $this->event->hourlyAt([15, 30, 45])->getExpression());
     }
 
@@ -84,6 +85,24 @@ public function testHourly()
         $this->assertSame('0 */3 * * *', $this->event->everyThreeHours()->getExpression());
         $this->assertSame('0 */4 * * *', $this->event->everyFourHours()->getExpression());
         $this->assertSame('0 */6 * * *', $this->event->everySixHours()->getExpression());
+
+        $this->assertSame('37 1-23/2 * * *', $this->event->everyOddHour(37)->getExpression());
+        $this->assertSame('37 */2 * * *', $this->event->everyTwoHours(37)->getExpression());
+        $this->assertSame('37 */3 * * *', $this->event->everyThreeHours(37)->getExpression());
+        $this->assertSame('37 */4 * * *', $this->event->everyFourHours(37)->getExpression());
+        $this->assertSame('37 */6 * * *', $this->event->everySixHours(37)->getExpression());
+
+        $this->assertSame('*/10 1-23/2 * * *', $this->event->everyOddHour('*/10')->getExpression());
+        $this->assertSame('*/10 */2 * * *', $this->event->everyTwoHours('*/10')->getExpression());
+        $this->assertSame('*/10 */3 * * *', $this->event->everyThreeHours('*/10')->getExpression());
+        $this->assertSame('*/10 */4 * * *', $this->event->everyFourHours('*/10')->getExpression());
+        $this->assertSame('*/10 */6 * * *', $this->event->everySixHours('*/10')->getExpression());
+
+        $this->assertSame('15,30,45 1-23/2 * * *', $this->event->everyOddHour([15, 30, 45])->getExpression());
+        $this->assertSame('15,30,45 */2 * * *', $this->event->everyTwoHours([15, 30, 45])->getExpression());
+        $this->assertSame('15,30,45 */3 * * *', $this->event->everyThreeHours([15, 30, 45])->getExpression());
+        $this->assertSame('15,30,45 */4 * * *', $this->event->everyFourHours([15, 30, 45])->getExpression());
+        $this->assertSame('15,30,45 */6 * * *', $this->event->everySixHours([15, 30, 45])->getExpression());
     }
 
     public function testMonthly()