refactor(validator): use reference time class

adhocore · adhocore · commit 05f139d0a9c3 · 2019-12-28T06:22:11.000+07:00
diff --git a/src/Validator.php b/src/Validator.php
@@ -92,38 +92,40 @@ public function inStepRange(int $value, int $start, int $end, int $step): bool
      * @internal
      *
      * @param string $value
-     * @param array  $time
+     * @param ReferenceTime  $time
      *
      * @return bool
      */
-    public function isValidMonthDay(string $value, array $time): bool
+    public function isValidMonthDay(string $value, ReferenceTime $reference): bool
     {
         if ($value == 'L') {
-            return $time[2] == $time[6];
+            return $reference->monthDay() == $reference->numDays();
         }
 
         if ($pos = \strpos($value, 'W')) {
             $value = \substr($value, 0, $pos);
-            $month = $this->zeroPad($time[8]);
+            $month = $this->zeroPad($reference->month());
 
-            return $this->isClosestWeekDay((int) $value, $month, $time);
+            return $this->isClosestWeekDay((int) $value, $month, $reference);
         }
 
         $this->unexpectedValue(2, $value);
+        // @codeCoverageIgnoreStart
     }
+    // @codeCoverageIgnoreEnd
 
-    protected function isClosestWeekDay(int $value, string $month, array $time): bool
+    protected function isClosestWeekDay(int $value, string $month, ReferenceTime $reference): bool
     {
         foreach ([0, -1, 1, -2, 2] as $i) {
             $incr = $value + $i;
-            if ($incr < 1 || $incr > $time[6]) {
+            if ($incr < 1 || $incr > $reference->numDays()) {
                 continue;
             }
 
             $incr  = $this->zeroPad($incr);
-            $parts = \explode(' ', \date('N m j', \strtotime("{$time[5]}-$month-$incr")));
+            $parts = \explode(' ', \date('N m j', \strtotime("{$reference->year()}-$month-$incr")));
             if ($parts[0] < 6 && $parts[1] == $month) {
-                return $time[2] == $parts[2];
+                return $reference->monthDay() == $parts[2];
             }
         }
 
@@ -138,16 +140,16 @@ protected function isClosestWeekDay(int $value, string $month, array $time): boo
      * @internal
      *
      * @param string $value
-     * @param array  $time
+     * @param ReferenceTime  $time
      *
      * @return bool
      */
-    public function isValidWeekDay(string $value, array $time): bool
+    public function isValidWeekDay(string $value, ReferenceTime $reference): bool
     {
-        $month = $this->zeroPad($time[8]);
+        $month = $this->zeroPad($reference->month());
 
         if (\strpos($value, 'L')) {
-            return $this->isLastWeekDay($value, $month, $time);
+            return $this->isLastWeekDay($value, $month, $reference);
         }
 
         if (!\strpos($value, '#')) {
@@ -156,11 +158,11 @@ public function isValidWeekDay(string $value, array $time): bool
 
         list($day, $nth) = \explode('#', \str_replace('0#', '7#', $value));
 
-        if (!$this->isNthWeekDay((int) $day, (int) $nth) || $time[9] != $day) {
+        if (!$this->isNthWeekDay((int) $day, (int) $nth) || $reference->weekDay1() != $day) {
             return false;
         }
 
-        return \intval($time[7] / 7) == $nth - 1;
+        return \intval($reference->day() / 7) == $nth - 1;
     }
 
     /**
@@ -176,15 +178,15 @@ public function unexpectedValue(int $pos, string $value)
         );
     }
 
-    protected function isLastWeekDay(string $value, string $month, array $time): bool
+    protected function isLastWeekDay(string $value, string $month, ReferenceTime $reference): bool
     {
+        $decr  = $reference->numDays();
         $value = \explode('L', \str_replace('7L', '0L', $value));
-        $decr  = $time[6];
 
         for ($i = 0; $i < 7; $i++) {
             $decr -= $i;
-            if (\date('w', \strtotime("{$time[5]}-$month-$decr")) == $value[0]) {
-                return $time[2] == $decr;
+            if (\date('w', \strtotime("{$reference->year()}-$month-$decr")) == $value[0]) {
+                return $reference->monthDay() == $decr;
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -92,38 +92,40 @@ public function inStepRange(int $value, int $start, int $end, int $step): bool`
`92`	`92`	`* @internal`
`93`	`93`	`*`
`94`	`94`	`* @param string $value`
`95`		`- * @param array $time`
	`95`	`+ * @param ReferenceTime $time`
`96`	`96`	`*`
`97`	`97`	`* @return bool`
`98`	`98`	`*/`
`99`		`- public function isValidMonthDay(string $value, array $time): bool`
	`99`	`+ public function isValidMonthDay(string $value, ReferenceTime $reference): bool`
`100`	`100`	`{`
`101`	`101`	`if ($value == 'L') {`
`102`		`- return $time[2] == $time[6];`
	`102`	`+ return $reference->monthDay() == $reference->numDays();`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`if ($pos = \strpos($value, 'W')) {`
`106`	`106`	`$value = \substr($value, 0, $pos);`
`107`		`- $month = $this->zeroPad($time[8]);`
	`107`	`+ $month = $this->zeroPad($reference->month());`
`108`	`108`
`109`		`- return $this->isClosestWeekDay((int) $value, $month, $time);`
	`109`	`+ return $this->isClosestWeekDay((int) $value, $month, $reference);`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`$this->unexpectedValue(2, $value);`
	`113`	`+ // @codeCoverageIgnoreStart`
`113`	`114`	`}`
	`115`	`+ // @codeCoverageIgnoreEnd`
`114`	`116`
`115`		`- protected function isClosestWeekDay(int $value, string $month, array $time): bool`
	`117`	`+ protected function isClosestWeekDay(int $value, string $month, ReferenceTime $reference): bool`
`116`	`118`	`{`
`117`	`119`	`foreach ([0, -1, 1, -2, 2] as $i) {`
`118`	`120`	`$incr = $value + $i;`
`119`		`- if ($incr < 1 \|\| $incr > $time[6]) {`
	`121`	`+ if ($incr < 1 \|\| $incr > $reference->numDays()) {`
`120`	`122`	`continue;`
`121`	`123`	`}`
`122`	`124`
`123`	`125`	`$incr = $this->zeroPad($incr);`
`124`		`- $parts = \explode(' ', \date('N m j', \strtotime("{$time[5]}-$month-$incr")));`
	`126`	`+ $parts = \explode(' ', \date('N m j', \strtotime("{$reference->year()}-$month-$incr")));`
`125`	`127`	`if ($parts[0] < 6 && $parts[1] == $month) {`
`126`		`- return $time[2] == $parts[2];`
	`128`	`+ return $reference->monthDay() == $parts[2];`
`127`	`129`	`}`
`128`	`130`	`}`
`129`	`131`
`@@ -138,16 +140,16 @@ protected function isClosestWeekDay(int $value, string $month, array $time): boo`
`138`	`140`	`* @internal`
`139`	`141`	`*`
`140`	`142`	`* @param string $value`
`141`		`- * @param array $time`
	`143`	`+ * @param ReferenceTime $time`
`142`	`144`	`*`
`143`	`145`	`* @return bool`
`144`	`146`	`*/`
`145`		`- public function isValidWeekDay(string $value, array $time): bool`
	`147`	`+ public function isValidWeekDay(string $value, ReferenceTime $reference): bool`
`146`	`148`	`{`
`147`		`- $month = $this->zeroPad($time[8]);`
	`149`	`+ $month = $this->zeroPad($reference->month());`
`148`	`150`
`149`	`151`	`if (\strpos($value, 'L')) {`
`150`		`- return $this->isLastWeekDay($value, $month, $time);`
	`152`	`+ return $this->isLastWeekDay($value, $month, $reference);`
`151`	`153`	`}`
`152`	`154`
`153`	`155`	`if (!\strpos($value, '#')) {`
`@@ -156,11 +158,11 @@ public function isValidWeekDay(string $value, array $time): bool`
`156`	`158`
`157`	`159`	`list($day, $nth) = \explode('#', \str_replace('0#', '7#', $value));`
`158`	`160`
`159`		`- if (!$this->isNthWeekDay((int) $day, (int) $nth) \|\| $time[9] != $day) {`
	`161`	`+ if (!$this->isNthWeekDay((int) $day, (int) $nth) \|\| $reference->weekDay1() != $day) {`
`160`	`162`	`return false;`
`161`	`163`	`}`
`162`	`164`
`163`		`- return \intval($time[7] / 7) == $nth - 1;`
	`165`	`+ return \intval($reference->day() / 7) == $nth - 1;`
`164`	`166`	`}`
`165`	`167`
`166`	`168`	`/**`
`@@ -176,15 +178,15 @@ public function unexpectedValue(int $pos, string $value)`
`176`	`178`	`);`
`177`	`179`	`}`
`178`	`180`
`179`		`- protected function isLastWeekDay(string $value, string $month, array $time): bool`
	`181`	`+ protected function isLastWeekDay(string $value, string $month, ReferenceTime $reference): bool`
`180`	`182`	`{`
	`183`	`+ $decr = $reference->numDays();`
`181`	`184`	`$value = \explode('L', \str_replace('7L', '0L', $value));`
`182`		`- $decr = $time[6];`
`183`	`185`
`184`	`186`	`for ($i = 0; $i < 7; $i++) {`
`185`	`187`	`$decr -= $i;`
`186`		`- if (\date('w', \strtotime("{$time[5]}-$month-$decr")) == $value[0]) {`
`187`		`- return $time[2] == $decr;`
	`188`	`+ if (\date('w', \strtotime("{$reference->year()}-$month-$decr")) == $value[0]) {`
	`189`	`+ return $reference->monthDay() == $decr;`
`188`	`190`	`}`
`189`	`191`	`}`
`190`	`192`