refactor(checker): use reference time class

adhocore · adhocore · commit 7b4138f807a5 · 2019-12-28T06:21:51.000+07:00
diff --git a/src/SegmentChecker.php b/src/SegmentChecker.php
@@ -22,6 +22,9 @@
  */
 class SegmentChecker
 {
+    /** @var ReferenceTime */
+    protected $reference;
+
     /** @var Validator */
     protected $validator;
 
@@ -30,21 +33,25 @@ public function __construct(Validator $validator = null)
         $this->validator = $validator ?: new Validator;
     }
 
+    public function setReference(ReferenceTime $reference)
+    {
+        $this->reference = $reference;
+    }
+
     /**
      * Checks if a cron segment satisfies given time.
      *
      * @param string $segment
      * @param int    $pos
-     * @param array  $times
      *
      * @return bool
      */
-    public function checkDue(string $segment, int $pos, array $times): bool
+    public function checkDue(string $segment, int $pos): bool
     {
         $offsets = \explode(',', \trim($segment));
 
         foreach ($offsets as $offset) {
-            if ($this->isOffsetDue($offset, $pos, $times)) {
+            if ($this->isOffsetDue($offset, $pos)) {
                 return true;
             }
         }
@@ -57,39 +64,40 @@ public function checkDue(string $segment, int $pos, array $times): bool
      *
      * @param string $offset
      * @param int    $pos
-     * @param array  $times
      *
      * @return bool
      */
-    protected function isOffsetDue(string $offset, int $pos, array $times): bool
+    protected function isOffsetDue(string $offset, int $pos): bool
     {
         if (\strpos($offset, '/') !== false) {
-            return $this->validator->inStep($times[$pos], $offset);
+            return $this->validator->inStep($this->reference->get($pos), $offset);
         }
 
         if (\strpos($offset, '-') !== false) {
-            return $this->validator->inRange($times[$pos], $offset);
+            return $this->validator->inRange($this->reference->get($pos), $offset);
         }
 
         if (\is_numeric($offset)) {
-            return $times[$pos] == $offset;
+            return $this->reference->isAt($offset, $pos);
         }
 
-        return $this->checkModifier($offset, $pos, $times);
+        return $this->checkModifier($offset, $pos);
     }
 
-    protected function checkModifier(string $offset, int $pos, array $times): bool
+    protected function checkModifier(string $offset, int $pos): bool
     {
         $isModifier = \strpbrk($offset, 'LCW#');
 
-        if ($pos === 2 && $isModifier) {
-            return $this->validator->isValidMonthDay($offset, $times);
+        if ($pos === ReferenceTime::MONTHDAY && $isModifier) {
+            return $this->validator->isValidMonthDay($offset, $this->reference);
         }
 
-        if ($pos === 4 && $isModifier) {
-            return $this->validator->isValidWeekDay($offset, $times);
+        if ($pos === ReferenceTime::WEEKDAY && $isModifier) {
+            return $this->validator->isValidWeekDay($offset, $this->reference);
         }
 
         $this->validator->unexpectedValue($pos, $offset);
+        // @codeCoverageIgnoreStart
     }
+    // @codeCoverageIgnoreEnd
 }

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,9 @@`
`22`	`22`	`*/`
`23`	`23`	`class SegmentChecker`
`24`	`24`	`{`
	`25`	`+ /** @var ReferenceTime */`
	`26`	`+ protected $reference;`
	`27`	`+`
`25`	`28`	`/** @var Validator */`
`26`	`29`	`protected $validator;`
`27`	`30`
`@@ -30,21 +33,25 @@ public function __construct(Validator $validator = null)`
`30`	`33`	`$this->validator = $validator ?: new Validator;`
`31`	`34`	`}`
`32`	`35`
	`36`	`+ public function setReference(ReferenceTime $reference)`
	`37`	`+ {`
	`38`	`+ $this->reference = $reference;`
	`39`	`+ }`
	`40`	`+`
`33`	`41`	`/**`
`34`	`42`	`* Checks if a cron segment satisfies given time.`
`35`	`43`	`*`
`36`	`44`	`* @param string $segment`
`37`	`45`	`* @param int $pos`
`38`		`- * @param array $times`
`39`	`46`	`*`
`40`	`47`	`* @return bool`
`41`	`48`	`*/`
`42`		`- public function checkDue(string $segment, int $pos, array $times): bool`
	`49`	`+ public function checkDue(string $segment, int $pos): bool`
`43`	`50`	`{`
`44`	`51`	`$offsets = \explode(',', \trim($segment));`
`45`	`52`
`46`	`53`	`foreach ($offsets as $offset) {`
`47`		`- if ($this->isOffsetDue($offset, $pos, $times)) {`
	`54`	`+ if ($this->isOffsetDue($offset, $pos)) {`
`48`	`55`	`return true;`
`49`	`56`	`}`
`50`	`57`	`}`
`@@ -57,39 +64,40 @@ public function checkDue(string $segment, int $pos, array $times): bool`
`57`	`64`	`*`
`58`	`65`	`* @param string $offset`
`59`	`66`	`* @param int $pos`
`60`		`- * @param array $times`
`61`	`67`	`*`
`62`	`68`	`* @return bool`
`63`	`69`	`*/`
`64`		`- protected function isOffsetDue(string $offset, int $pos, array $times): bool`
	`70`	`+ protected function isOffsetDue(string $offset, int $pos): bool`
`65`	`71`	`{`
`66`	`72`	`if (\strpos($offset, '/') !== false) {`
`67`		`- return $this->validator->inStep($times[$pos], $offset);`
	`73`	`+ return $this->validator->inStep($this->reference->get($pos), $offset);`
`68`	`74`	`}`
`69`	`75`
`70`	`76`	`if (\strpos($offset, '-') !== false) {`
`71`		`- return $this->validator->inRange($times[$pos], $offset);`
	`77`	`+ return $this->validator->inRange($this->reference->get($pos), $offset);`
`72`	`78`	`}`
`73`	`79`
`74`	`80`	`if (\is_numeric($offset)) {`
`75`		`- return $times[$pos] == $offset;`
	`81`	`+ return $this->reference->isAt($offset, $pos);`
`76`	`82`	`}`
`77`	`83`
`78`		`- return $this->checkModifier($offset, $pos, $times);`
	`84`	`+ return $this->checkModifier($offset, $pos);`
`79`	`85`	`}`
`80`	`86`
`81`		`- protected function checkModifier(string $offset, int $pos, array $times): bool`
	`87`	`+ protected function checkModifier(string $offset, int $pos): bool`
`82`	`88`	`{`
`83`	`89`	`$isModifier = \strpbrk($offset, 'LCW#');`
`84`	`90`
`85`		`- if ($pos === 2 && $isModifier) {`
`86`		`- return $this->validator->isValidMonthDay($offset, $times);`
	`91`	`+ if ($pos === ReferenceTime::MONTHDAY && $isModifier) {`
	`92`	`+ return $this->validator->isValidMonthDay($offset, $this->reference);`
`87`	`93`	`}`
`88`	`94`
`89`		`- if ($pos === 4 && $isModifier) {`
`90`		`- return $this->validator->isValidWeekDay($offset, $times);`
	`95`	`+ if ($pos === ReferenceTime::WEEKDAY && $isModifier) {`
	`96`	`+ return $this->validator->isValidWeekDay($offset, $this->reference);`
`91`	`97`	`}`
`92`	`98`
`93`	`99`	`$this->validator->unexpectedValue($pos, $offset);`
	`100`	`+ // @codeCoverageIgnoreStart`
`94`	`101`	`}`
	`102`	`+ // @codeCoverageIgnoreEnd`
`95`	`103`	`}`