fix(validator): strict checks for in-step, handle weekends correctly

adhocore · Oct 20, 2021 · b894e4e · b894e4e
1 parent e6c11df
commit b894e4e
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/Validator.php b/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
      *