Clamp $expireSecs instead of using nasty if/else logic

dominionenterprises · Mar 16, 2017 · 3bf4e86 · 3bf4e86
1 parent 31fabd2
commit 3bf4e86
Showing 1 changed file with 4 additions and 14 deletions.
diff --git a/src/ProcessRegistry.php b/src/ProcessRegistry.php
@@ -113,13 +113,8 @@ public function add(
 
             // add our process
             $expireSecs = time() + $minsBeforeExpire * 60;
-            if (!is_int($expireSecs)) {
-                if ($minsBeforeExpire > 0) {
-                    $expireSecs = self::MONGO_INT32_MAX;
-                } else {
-                    $expireSecs = 0;
-                }
-            }
+            //ensure expireSecs is between 0 and self::MONGO_INT32_MAX
+            $expireSecs = max(0, min($expireSecs, self::MONGO_INT32_MAX));
 
             $thisHostPids[$thisPid] = $expireSecs;
             $replacement['hosts'][$thisHostName] = $thisHostPids;
@@ -168,13 +163,8 @@ public function remove(string $id)
     public function reset(string $id, int $minsBeforeExpire)
     {
         $expireSecs = time() + $minsBeforeExpire * 60;
-        if (!is_int($expireSecs)) {
-            if ($minsBeforeExpire > 0) {
-                $expireSecs = self::MONGO_INT32_MAX;
-            } else {
-                $expireSecs = 0;
-            }
-        }
+        //ensure expireSecs is between 0 and self::MONGO_INT32_MAX
+        $expireSecs = max(0, min($expireSecs, self::MONGO_INT32_MAX));
 
         $thisHostName = self::_getEncodedHostname();
         $thisPid = getmypid();