Merge pull request #20 from adhocore/fix-step-and-weekday-check

Fix step and weekday check

Author: adhocore

src/Normalizer.php

@@ -68,8 +68,8 @@ public function normalizeExpr(string $expr): string
     {
         $expr = \trim($expr);
 
-        if (isset(static::$expressions[$expr])) {
-            return static::$expressions[$expr];
+        if (isset(static::$expressions[$exp = \strtolower($expr)])) {
+            return static::$expressions[$exp];
         }
 
         $expr  = \preg_replace('~\s+~', ' ', $expr);

src/SegmentChecker.php

@@ -99,6 +99,5 @@ protected function checkModifier(string $offset, int $pos): bool
         $this->validator->unexpectedValue($pos, $offset);
         // @codeCoverageIgnoreStart
     }
-
     // @codeCoverageIgnoreEnd
 }

src/Validator.php

@@ -53,7 +53,7 @@ public function inStep(int $value, string $offset): bool
             return false;
         }
 
-        if (\strpos($offset, '*/') !== false || \strpos($offset, '0/') !== false) {
+        if (\strpos($offset, '*/') === 0 || \strpos($offset, '0/') === 0) {
             return $value % $parts[1] === 0;
         }
 
@@ -91,7 +91,7 @@ public function inStepRange(int $value, int $start, int $end, int $step): bool
      * @internal
      *
      * @param string        $value
-     * @param ReferenceTime $time
+     * @param ReferenceTime $reference
      *
      * @return bool
      */
@@ -140,7 +140,7 @@ protected function isClosestWeekDay(int $value, string $month, ReferenceTime $re
      * @internal
      *
      * @param string        $value
-     * @param ReferenceTime $time
+     * @param ReferenceTime $reference
      *
      * @return bool
      */
@@ -156,16 +156,18 @@ public function isValidWeekDay(string $value, ReferenceTime $reference): bool
             $this->unexpectedValue(4, $value);
         }
 
-        list($day, $nth) = \explode('#', \str_replace('0#', '7#', $value));
+        list($day, $nth) = \explode('#', \str_replace('7#', '0#', $value));
 
-        if (!$this->isNthWeekDay((int) $day, (int) $nth) || $reference->weekDay1() != $day) {
+        if (!$this->isNthWeekDay((int) $day, (int) $nth) || $reference->weekDay() != $day) {
             return false;
         }
 
         return \intval($reference->day() / 7) == $nth - 1;
     }
 
     /**
+     * Throws UnexpectedValueException.
+     *
      * @param int    $pos
      * @param string $value
      *

tests/ExpressionTest.php

@@ -175,6 +175,19 @@ public function scheduleProvider()
             ['5/20 * * * *', '2018-08-13 00:24:00', '2011-07-27 00:00:00', false],                // issue #12
             ['5/20 * * * *', strtotime('2018-08-13 00:45:00'), '2011-07-27 00:00:00', true],      // issue #12
             ['5-11/4 * * * *', strtotime('2018-08-13 00:03:00'), '2011-07-27 00:00:00', false],
+
+            // New from https://github.com/dragonmantank/cron-expression
+            ['0 0 L * 0', strtotime('2011-06-15 23:09:00'), '2011-06-19 00:00:00', false],
+            ['3-59/15 6-12 */15 1 2-5', strtotime('2017-01-08 00:00:00'), '2017-01-10 06:03:00', false],
+            ['* * * * MON-FRI', strtotime('2017-01-08 00:00:00'), strtotime('2017-01-09 00:00:00'), false],
+            ['* * * * TUE', strtotime('2017-01-08 00:00:00'), strtotime('2017-01-10 00:00:00'), false],
+            ['0 1 15 JUL mon,Wed,FRi', strtotime('2019-11-14 00:00:00'), strtotime('2020-07-01 01:00:00'), false],
+            ['0 1 15 jul mon,Wed,FRi', strtotime('2019-11-14 00:00:00'), strtotime('2020-07-01 01:00:00'), false],
+            ['@weekly', strtotime('2019-11-14 00:00:00'), strtotime('2019-11-17 00:00:00'), false],
+            ['@weekly', strtotime('2019-11-14 00:00:00'), strtotime('2019-11-17 00:00:00'), false],
+            ['@weekly', strtotime('2019-11-14 00:00:00'), strtotime('2019-11-17 00:00:00'), false],
+            ['0 12 * * ?', strtotime('2020-08-20 00:00:00'), strtotime('2020-08-20 12:00:00'), false],
+            ['0 12 ? * *', strtotime('2020-08-20 00:00:00'), strtotime('2020-08-20 12:00:00'), false],
         ];
     }
 }