Merge pull request #8 from adhocore/develop

Refactor

Author: adhocore

src/Expression.php

@@ -87,7 +87,7 @@ public function isCronDue($expr, $time = null)
                 continue;
             }
 
-            if (!$checker->isDue($segment, $pos, $time)) {
+            if (!$checker->checkDue($segment, $pos, $time)) {
                 return false;
             }
         }

src/SegmentChecker.php

@@ -28,15 +28,15 @@ public function __construct()
      *
      * @return bool
      */
-    public function isDue($segment, $pos, $time)
+    public function checkDue($segment, $pos, $time)
     {
         $isDue   = true;
         $offsets = \explode(',', \trim($segment));
 
         foreach ($offsets as $offset) {
             if (null === $isDue = $this->isOffsetDue($offset, $pos, $time)) {
                 throw new \UnexpectedValueException(
-                    sprintf('Invalid offset value %s for segment #%d', $offset, $pos)
+                    sprintf('Invalid offset value at segment #%d: %s', $pos, $offset)
                 );
             }
 
@@ -86,8 +86,6 @@ protected function checkModifier($offset, $pos, $time)
             return $this->validator->isValidWeekDay($offset, $time);
         }
 
-        // @codeCoverageIgnoreStart
-        return !$isModifier;
-        // @codeCoverageIgnoreEnd
+        return null;
     }
 }

src/Validator.php

@@ -93,25 +93,23 @@ public function isValidWeekDay($value, $time)
         $month = \str_pad($time[8], 2, '0', \STR_PAD_LEFT);
 
         if (\strpos($value, 'L')) {
-            return $this->lastWeekDay($value, $month, $time);
+            return $this->isLastWeekDay($value, $month, $time);
         }
 
-        if (\strpos($value, '#')) {
-            $value = \explode('#', \str_replace('0#', '7#', $value));
+        if (!\strpos($value, '#')) {
+            return null;
+        }
 
-            if ($value[0] < 0 || $value[0] > 7 || $value[1] < 1 || $value[1] > 5 || $time[9] != $value[0]) {
-                return false;
-            }
+        list($day, $nth) = \explode('#', \str_replace('0#', '7#', $value));
 
-            return \intval($time[7] / 7) == $value[1] - 1;
+        if (!$this->isNthWeekDay($day, $nth) || $time[9] != $day) {
+            return false;
         }
 
-        // @codeCoverageIgnoreStart
-        return false;
-        // @codeCoverageIgnoreEnd
+        return \intval($time[7] / 7) == $nth - 1;
     }
 
-    protected function lastWeekDay($value, $month, $time)
+    protected function isLastWeekDay($value, $month, $time)
     {
         $value = \explode('L', \str_replace('7L', '0L', $value));
         $decr  = $time[6];
@@ -125,4 +123,9 @@ protected function lastWeekDay($value, $month, $time)
 
         return false;
     }
+
+    protected function isNthWeekDay($day, $nth)
+    {
+        return !($day < 0 || $day > 7 || $nth < 1 || $nth > 5);
+    }
 }

tests/ExpressionTest.php

@@ -9,8 +9,15 @@ class ExpressionTest extends \PHPUnit_Framework_TestCase
     /**
      * @dataProvider scheduleProvider
      */
-    public function test_isDue($expr, $time, $foo, $expected)
+    public function test_isDue($expr, $time, $foo, $expected, $throwsAt = false)
     {
+        if ($throwsAt) {
+            $this->setExpectedException(
+                \UnexpectedValueException::class,
+                "Invalid offset value at segment #$throwsAt"
+            );
+        }
+
         $actual = Expression::isDue($expr, $time);
 
         $this->assertSame($expected, $actual, 'The expression ' . $expr . ' has failed');
@@ -117,6 +124,8 @@ public function scheduleProvider()
             ['* * * * 5#2', strtotime('2011-07-01 00:00:00'), '2011-07-08 00:00:00', false],
             ['* * * * 5#1', strtotime('2011-07-01 00:00:00'), '2011-07-01 00:00:00', true],
             ['* * * * 3#4', strtotime('2011-07-01 00:00:00'), '2011-07-27 00:00:00', false],
+            ['* * * * 4W', strtotime('2011-07-01 00:00:00'), '2011-07-27 00:00:00', false, 4], // seg 4
+            ['* * * 1L *', strtotime('2011-07-01 00:00:00'), '2011-07-27 00:00:00', false, 3], // seg 3
         ];
     }
 }