refactor(expr): normalize expr, use regex split instead

adhocore · Aug 12, 2019 · 74f8dfc · 74f8dfc
1 parent 0c3405b
commit 74f8dfc
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/Expression.php b/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
+        );
     }
 }