refactor: expression method calls

Author: adhocore

src/Expression.php

@@ -58,14 +58,36 @@ class Expression
      */
     public static function isDue($expr, $time = null)
     {
-        list($expr, $time) = static::process($expr, $time);
+        static $instance;
 
+        if (!$instance) {
+            $instance = new static;
+        }
+
+        return $instance->isCronDue($expr, $time);
+    }
+
+    /**
+     * Instance call.
+     *
+     * Parse cron expression to decide if it can be run on given time (or default now).
+     *
+     * @param string $expr The cron expression.
+     * @param int    $time The timestamp to validate the cron expr against. Defaults to now.
+     *
+     * @return bool
+     */
+    public function isCronDue($expr, $time = null)
+    {
+        list($expr, $time) = $this->process($expr, $time);
+
+        $checker = new SegmentChecker;
         foreach ($expr as $pos => $segment) {
             if ($segment === '*' || $segment === '?') {
                 continue;
             }
 
-            if (!SegmentChecker::isDue($segment, $pos, $time)) {
+            if (!$checker->isDue($segment, $pos, $time)) {
                 return false;
             }
         }
@@ -81,53 +103,38 @@ public static function isDue($expr, $time = null)
      *
      * @return array
      */
-    protected static function process($expr, $time)
+    protected function process($expr, $time)
     {
         if (isset(static::$expressions[$expr])) {
             $expr = static::$expressions[$expr];
         }
 
-        $expr = str_ireplace(array_keys(static::$literals), array_values(static::$literals), $expr);
-        $expr = explode(' ', $expr);
+        $expr = \str_ireplace(\array_keys(static::$literals), \array_values(static::$literals), $expr);
+        $expr = \explode(' ', $expr);
 
-        if (count($expr) < 5 || count($expr) > 6) {
+        if (\count($expr) < 5 || \count($expr) > 6) {
             throw new \UnexpectedValueException(
                 'Cron $expr should have 5 or 6 segments delimited by space'
             );
         }
 
         $time = static::normalizeTime($time);
 
-        $time = array_map('intval', explode(' ', date('i G j n w Y t d m N', $time)));
+        $time = \array_map('intval', \explode(' ', \date('i G j n w Y t d m N', $time)));
 
         return [$expr, $time];
     }
 
-    protected static function normalizeTime($time)
+    protected function normalizeTime($time)
     {
         if (empty($time)) {
-            $time = time();
-        } elseif (is_string($time)) {
-            $time = strtotime($time);
+            $time = \time();
+        } elseif (\is_string($time)) {
+            $time = \strtotime($time);
         } elseif ($time instanceof \DateTime) {
             $time = $time->getTimestamp();
         }
 
         return $time;
     }
-
-    /**
-     * Instance call.
-     *
-     * Parse cron expression to decide if it can be run on given time (or default now).
-     *
-     * @param string $expr The cron expression.
-     * @param int    $time The timestamp to validate the cron expr against. Defaults to now.
-     *
-     * @return bool
-     */
-    public function isCronDue($expr, $time = null)
-    {
-        return static::isDue($expr, $time);
-    }
 }