refactor: rename array of time parts to times

adhocore · adhocore · commit ee2cc9608598 · 2018-08-15T23:15:50.000+07:00
diff --git a/src/Expression.php b/src/Expression.php
@@ -88,15 +88,15 @@ public static function isDue($expr, $time = null)
      */
     public function isCronDue($expr, $time = null)
     {
-        list($expr, $time) = $this->process($expr, $time);
+        list($expr, $times) = $this->process($expr, $time);
 
         $checker = new SegmentChecker;
         foreach ($expr as $pos => $segment) {
             if ($segment === '*' || $segment === '?') {
                 continue;
             }
 
-            if (!$checker->checkDue($segment, $pos, $time)) {
+            if (!$checker->checkDue($segment, $pos, $times)) {
                 return false;
             }
         }
@@ -127,11 +127,10 @@ protected function process($expr, $time)
             );
         }
 
-        $time = static::normalizeTime($time);
+        $time  = static::normalizeTime($time);
+        $times = \array_map('intval', \explode(' ', \date('i G j n w Y t d m N', $time)));
 
-        $time = \array_map('intval', \explode(' ', \date('i G j n w Y t d m N', $time)));
-
-        return [$expr, $time];
+        return [$expr, $times];
     }
 
     protected function normalizeTime($time)
diff --git a/src/SegmentChecker.php b/src/SegmentChecker.php
@@ -33,17 +33,17 @@ public function __construct()
      *
      * @param string $segment
      * @param int    $pos
-     * @param int    $time
+     * @param array  $times
      *
      * @return bool
      */
-    public function checkDue($segment, $pos, $time)
+    public function checkDue($segment, $pos, $times)
     {
         $isDue   = true;
         $offsets = \explode(',', \trim($segment));
 
         foreach ($offsets as $offset) {
-            if (null === $isDue = $this->isOffsetDue($offset, $pos, $time)) {
+            if (null === $isDue = $this->isOffsetDue($offset, $pos, $times)) {
                 throw new \UnexpectedValueException(
                     sprintf('Invalid offset value at segment #%d: %s', $pos, $offset)
                 );
@@ -62,37 +62,37 @@ public function checkDue($segment, $pos, $time)
      *
      * @param string $offset
      * @param int    $pos
-     * @param array  $time
+     * @param array  $times
      *
      * @return bool|null
      */
-    protected function isOffsetDue($offset, $pos, $time)
+    protected function isOffsetDue($offset, $pos, $times)
     {
         if (\strpos($offset, '/') !== false) {
-            return $this->validator->inStep($time[$pos], $offset);
+            return $this->validator->inStep($times[$pos], $offset);
         }
 
         if (\strpos($offset, '-') !== false) {
-            return $this->validator->inRange($time[$pos], $offset);
+            return $this->validator->inRange($times[$pos], $offset);
         }
 
         if (\is_numeric($offset)) {
-            return $time[$pos] == $offset;
+            return $times[$pos] == $offset;
         }
 
-        return $this->checkModifier($offset, $pos, $time);
+        return $this->checkModifier($offset, $pos, $times);
     }
 
-    protected function checkModifier($offset, $pos, $time)
+    protected function checkModifier($offset, $pos, $times)
     {
         $isModifier = \strpbrk($offset, 'LCW#');
 
         if ($pos === 2 && $isModifier) {
-            return $this->validator->isValidMonthDay($offset, $time);
+            return $this->validator->isValidMonthDay($offset, $times);
         }
 
         if ($pos === 4 && $isModifier) {
-            return $this->validator->isValidWeekDay($offset, $time);
+            return $this->validator->isValidWeekDay($offset, $times);
         }
 
         return null;

Original file line number	Diff line number	Diff line change
`@@ -88,15 +88,15 @@ public static function isDue($expr, $time = null)`
`88`	`88`	`*/`
`89`	`89`	`public function isCronDue($expr, $time = null)`
`90`	`90`	`{`
`91`		`- list($expr, $time) = $this->process($expr, $time);`
	`91`	`+ list($expr, $times) = $this->process($expr, $time);`
`92`	`92`
`93`	`93`	`$checker = new SegmentChecker;`
`94`	`94`	`foreach ($expr as $pos => $segment) {`
`95`	`95`	`if ($segment === '*' \|\| $segment === '?') {`
`96`	`96`	`continue;`
`97`	`97`	`}`
`98`	`98`
`99`		`- if (!$checker->checkDue($segment, $pos, $time)) {`
	`99`	`+ if (!$checker->checkDue($segment, $pos, $times)) {`
`100`	`100`	`return false;`
`101`	`101`	`}`
`102`	`102`	`}`
`@@ -127,11 +127,10 @@ protected function process($expr, $time)`
`127`	`127`	`);`
`128`	`128`	`}`
`129`	`129`
`130`		`- $time = static::normalizeTime($time);`
	`130`	`+ $time = static::normalizeTime($time);`
	`131`	`+ $times = \array_map('intval', \explode(' ', \date('i G j n w Y t d m N', $time)));`
`131`	`132`
`132`		`- $time = \array_map('intval', \explode(' ', \date('i G j n w Y t d m N', $time)));`
`133`		`-`
`134`		`- return [$expr, $time];`
	`133`	`+ return [$expr, $times];`
`135`	`134`	`}`
`136`	`135`
`137`	`136`	`protected function normalizeTime($time)`
Original file line number	Diff line number	Diff line change
`@@ -33,17 +33,17 @@ public function __construct()`
`33`	`33`	`*`
`34`	`34`	`* @param string $segment`
`35`	`35`	`* @param int $pos`
`36`		`- * @param int $time`
	`36`	`+ * @param array $times`
`37`	`37`	`*`
`38`	`38`	`* @return bool`
`39`	`39`	`*/`
`40`		`- public function checkDue($segment, $pos, $time)`
	`40`	`+ public function checkDue($segment, $pos, $times)`
`41`	`41`	`{`
`42`	`42`	`$isDue = true;`
`43`	`43`	`$offsets = \explode(',', \trim($segment));`
`44`	`44`
`45`	`45`	`foreach ($offsets as $offset) {`
`46`		`- if (null === $isDue = $this->isOffsetDue($offset, $pos, $time)) {`
	`46`	`+ if (null === $isDue = $this->isOffsetDue($offset, $pos, $times)) {`
`47`	`47`	`throw new \UnexpectedValueException(`
`48`	`48`	`sprintf('Invalid offset value at segment #%d: %s', $pos, $offset)`
`49`	`49`	`);`
`@@ -62,37 +62,37 @@ public function checkDue($segment, $pos, $time)`
`62`	`62`	`*`
`63`	`63`	`* @param string $offset`
`64`	`64`	`* @param int $pos`
`65`		`- * @param array $time`
	`65`	`+ * @param array $times`
`66`	`66`	`*`
`67`	`67`	`* @return bool\|null`
`68`	`68`	`*/`
`69`		`- protected function isOffsetDue($offset, $pos, $time)`
	`69`	`+ protected function isOffsetDue($offset, $pos, $times)`
`70`	`70`	`{`
`71`	`71`	`if (\strpos($offset, '/') !== false) {`
`72`		`- return $this->validator->inStep($time[$pos], $offset);`
	`72`	`+ return $this->validator->inStep($times[$pos], $offset);`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`if (\strpos($offset, '-') !== false) {`
`76`		`- return $this->validator->inRange($time[$pos], $offset);`
	`76`	`+ return $this->validator->inRange($times[$pos], $offset);`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`if (\is_numeric($offset)) {`
`80`		`- return $time[$pos] == $offset;`
	`80`	`+ return $times[$pos] == $offset;`
`81`	`81`	`}`
`82`	`82`
`83`		`- return $this->checkModifier($offset, $pos, $time);`
	`83`	`+ return $this->checkModifier($offset, $pos, $times);`
`84`	`84`	`}`
`85`	`85`
`86`		`- protected function checkModifier($offset, $pos, $time)`
	`86`	`+ protected function checkModifier($offset, $pos, $times)`
`87`	`87`	`{`
`88`	`88`	`$isModifier = \strpbrk($offset, 'LCW#');`
`89`	`89`
`90`	`90`	`if ($pos === 2 && $isModifier) {`
`91`		`- return $this->validator->isValidMonthDay($offset, $time);`
	`91`	`+ return $this->validator->isValidMonthDay($offset, $times);`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`if ($pos === 4 && $isModifier) {`
`95`		`- return $this->validator->isValidWeekDay($offset, $time);`
	`95`	`+ return $this->validator->isValidWeekDay($offset, $times);`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`return null;`