peer review suggestions added

Author: williamhuntjr

src/Memoize.php

@@ -7,12 +7,12 @@ interface Memoize
     /**
      * Gets the value stored in the cache or uses the passed function to compute the value and save to cache.
      *
-     * @param string   $key          The key to fetch
-     * @param callable $compute      A function to run if the value was not cached that will return the result.
-     * @param int      $cacheTime    The number of seconds to cache the response for, or null to not expire it ever.
-     * @param bool     $shouldUpdate Sets whether the cache should update itself during the call.
+     * @param string   $key       The key to fetch
+     * @param callable $compute   A function to run if the value was not cached that will return the result.
+     * @param int      $cacheTime The number of seconds to cache the response for, or null to not expire it ever.
+     * @param bool     $refresh   Determines if cache should be refreshed.
      *
      * @return mixed The data requested, optionally pulled from cache
      */
-    public function memoizeCallable(string $key, callable $compute, int $cacheTime = null, bool $shouldUpdate = false);
+    public function memoizeCallable(string $key, callable $compute, int $cacheTime = null, bool $refresh = false);
 }

src/Memory.php

@@ -22,13 +22,13 @@ class Memory implements Memoize
      * @param string   $key
      * @param callable $compute
      * @param int|null $cacheTime
-     * @param bool     $shouldUpdate
+     * @param bool     $refresh
      *
      * @return mixed
      */
-    public function memoizeCallable(string $key, callable $compute, int $cacheTime = null, $shouldUpdate = false)
+    public function memoizeCallable(string $key, callable $compute, int $cacheTime = null, bool $refresh = false)
     {
-        if (array_key_exists($key, $this->cache)) {
+        if (array_key_exists($key, $this->cache) && !$refresh) {
             return $this->cache[$key];
         }
 

src/None.php

@@ -16,11 +16,11 @@ class None implements Memoize
      * @param string   $key
      * @param callable $compute
      * @param int|null $cacheTime
-     * @param bool     $shouldUpdate
+     * @param bool     $refresh
      *
      * @return mixed
      */
-    public function memoizeCallable(string $key, callable $compute, int $cacheTime = null, $shouldUpdate = false)
+    public function memoizeCallable(string $key, callable $compute, int $cacheTime = null, bool $refresh = false)
     {
         return call_user_func($compute);
     }

src/Predis.php

@@ -65,13 +65,13 @@ public function __construct(
      * @param string   $key
      * @param callable $compute
      * @param int|null $cacheTime
-     * @param bool     $shouldUpdate
+     * @param bool     $refresh
      *
      * @return mixed
      */
-    public function memoizeCallable(string $key, callable $compute, int $cacheTime = null, bool $shouldUpdate = false)
+    public function memoizeCallable(string $key, callable $compute, int $cacheTime = null, bool $refresh = false)
     {
-        if (!$this->refresh) {
+        if (!$this->refresh && !$refresh) {
             try {
                 if (rand(1, 100) <= $this->refreshPercent) {
                     // {$refreshPercent}% of requests should check to see if this key is almost expired.
@@ -83,14 +83,10 @@ public function memoizeCallable(string $key, callable $compute, int $cacheTime =
                         return $this->getData($key, $compute, $cacheTime);
                     }
                 }
-
                 $cached = $this->client->get($key);
-                if ($shouldUpdate === false) {
-                    $cached = $this->client->get($key);
-                    if ($cached !== null) {
-                        $data = json_decode($cached, true);
-                        return $data['result'];
-                    }
+                if ($cached !== null) {
+                    $data = json_decode($cached, true);
+                    return $data['result'];
                 }
             } catch (\Exception $e) {
                 return $this->getData($key, $compute, $cacheTime);