Merge pull request #15 from adhocore/14-expr-delimiter

14 expr delimiter

Author: adhocore

.travis.yml

@@ -1,12 +1,11 @@
 language: php
 
 php:
-  - 5.4
-  - 5.5
   - 5.6
   - 7.0
   - 7.1
   - 7.2
+  - 7.3
   - nightly
 
 matrix:

src/Expression.php

@@ -173,8 +173,7 @@ public function filter(array $jobs, $time = null)
     protected function process($expr, $time)
     {
         $expr = $this->normalizeExpr($expr);
-        $expr = \str_ireplace(\array_keys(static::$literals), \array_values(static::$literals), $expr);
-        $expr = \explode(' ', $expr);
+        $expr = \preg_split('~\s+~', $expr); // 14
 
         if (\count($expr) < 5 || \count($expr) > 6) {
             throw new \UnexpectedValueException(
@@ -203,10 +202,16 @@ protected function normalizeTime($time)
 
     protected function normalizeExpr($expr)
     {
+        $expr = \trim($expr);
+
         if (isset(static::$expressions[$expr])) {
-            $expr = static::$expressions[$expr];
+            return static::$expressions[$expr];
         }
 
-        return $expr;
+        return \str_ireplace(
+            \array_keys(static::$literals),
+            \array_values(static::$literals),
+            $expr
+        );
     }
 }

tests/ExpressionTest.php

@@ -103,6 +103,10 @@ public function scheduleProvider()
 
             ['*/2 */2 * * *', '2015-08-10 21:47:27', '2015-08-10 22:00:00', false],
             ['* * * * *', '2015-08-10 21:50:37', '2015-08-10 21:50:00', true],
+            ['* * * * * ', '2015-08-10 21:50:37', '2015-08-10 21:50:00', true],
+            ['*  *  *  *  *', '2015-08-10 21:50:37', '2015-08-10 21:50:00', true],
+            ["*\t*\t*\t*\t*", '2015-08-10 21:50:37', '2015-08-10 21:50:00', true],
+            ["*\t\t*\t\t*\t\t*\t\t*", '2015-08-10 21:50:37', '2015-08-10 21:50:00', true],
             ['* 20,21,22 * * *', '2015-08-10 21:50:00', '2015-08-10 21:50:00', true],
             // Handles CSV values
             ['* 20,22 * * *', '2015-08-10 21:50:00', '2015-08-10 22:00:00', false],