lots of refactoring.

laravel · Dec 1, 2015 · bbd825b · bbd825b
1 parent 5ebe13c
commit bbd825b
Show file tree

Hide file tree

Showing 19 changed files with 136 additions and 347 deletions.
diff --git a/src/Illuminate/Cache/ApcStore.php b/src/Illuminate/Cache/ApcStore.php
@@ -6,7 +6,7 @@
 
 class ApcStore extends TaggableStore implements Store
 {
-    use DefaultMultipleTrait;
+    use RetrievesMultipleKeys;
 
     /**
      * The APC wrapper instance.
@@ -38,7 +38,7 @@ public function __construct(ApcWrapper $apc, $prefix = '')
     /**
      * Retrieve an item from the cache by key.
      *
-     * @param  string  $key
+     * @param  string|array  $key
      * @return mixed
      */
     public function get($key)

diff --git a/src/Illuminate/Cache/ArrayStore.php b/src/Illuminate/Cache/ArrayStore.php
@@ -6,7 +6,7 @@
 
 class ArrayStore extends TaggableStore implements Store
 {
-    use DefaultMultipleTrait;
+    use RetrievesMultipleKeys;
 
     /**
      * The array of stored values.
@@ -18,7 +18,7 @@ class ArrayStore extends TaggableStore implements Store
     /**
      * Retrieve an item from the cache by key.
      *
-     * @param  string  $key
+     * @param  string|array  $key
      * @return mixed
      */
     public function get($key)
@@ -42,7 +42,7 @@ public function put($key, $value, $minutes)
     }
 
     /**
-     * Store multiple items in the cache for a set number of minutes.
+     * Store multiple items in the cache for a given number of minutes.
      *
      * @param  array  $values
      * @param  int  $minutes

diff --git a/src/Illuminate/Cache/DatabaseStore.php b/src/Illuminate/Cache/DatabaseStore.php
@@ -10,7 +10,7 @@
 
 class DatabaseStore implements Store
 {
-    use DefaultMultipleTrait;
+    use RetrievesMultipleKeys;
 
     /**
      * The database connection instance.
@@ -60,7 +60,7 @@ public function __construct(ConnectionInterface $connection, EncrypterContract $
     /**
      * Retrieve an item from the cache by key.
      *
-     * @param  string  $key
+     * @param  string|array  $key
      * @return mixed
      */
     public function get($key)

diff --git a/src/Illuminate/Cache/DefaultMultipleTrait.php b/src/Illuminate/Cache/DefaultMultipleTrait.php
diff --git a/src/Illuminate/Cache/FileStore.php b/src/Illuminate/Cache/FileStore.php
@@ -9,7 +9,7 @@
 
 class FileStore implements Store
 {
-    use DefaultMultipleTrait;
+    use RetrievesMultipleKeys;
 
     /**
      * The Illuminate Filesystem instance.
@@ -41,7 +41,7 @@ public function __construct(Filesystem $files, $directory)
     /**
      * Retrieve an item from the cache by key.
      *
-     * @param  string  $key
+     * @param  string|array  $key
      * @return mixed
      */
     public function get($key)

diff --git a/src/Illuminate/Cache/MemcachedStore.php b/src/Illuminate/Cache/MemcachedStore.php
@@ -37,7 +37,7 @@ public function __construct($memcached, $prefix = '')
     /**
      * Retrieve an item from the cache by key.
      *
-     * @param  string  $key
+     * @param  string|array  $key
      * @return mixed
      */
     public function get($key)
@@ -52,29 +52,24 @@ public function get($key)
     /**
      * Retrieve multiple items from the cache by key.
      *
-     * Items not found in the cache will have a null value for the key.
+     * Items not found in the cache will have a null value.
      *
      * @param  array  $keys
      * @return array
      */
-    public function getMultiple(array $keys)
+    public function many(array $keys)
     {
-        $prefixedKeys = [];
-
-        foreach ($keys as $keyToPrefix) {
-            $prefixedKeys[] = $this->prefix.$keyToPrefix;
-        }
+        $prefixedKeys = array_map(function ($key) {
+            return $this->prefix.$key;
+        }, $keys);
 
-        $cas = null;
-        $cacheValues = $this->memcached->getMulti($prefixedKeys, $cas, Memcached::GET_PRESERVE_ORDER);
+        $values = $this->memcached->getMulti($prefixedKeys, null, Memcached::GET_PRESERVE_ORDER);
 
         if ($this->memcached->getResultCode() != 0) {
             return array_fill_keys($keys, null);
         }
 
-        $returnValues = array_combine($keys, $cacheValues);
-
-        return $returnValues;
+        return array_combine($keys, $values);
     }
 
     /**
@@ -91,21 +86,21 @@ public function put($key, $value, $minutes)
     }
 
     /**
-     * Store multiple items in the cache for a set number of minutes.
+     * Store multiple items in the cache for a given number of minutes.
      *
      * @param  array  $values
      * @param  int  $minutes
      * @return void
      */
-    public function putMultiple(array $values, $minutes)
+    public function putMany(array $values, $minutes)
     {
-        $formattedKeyValues = [];
+        $prefixedValues = [];
 
-        foreach ($values as $keyToPrefix => $singleValue) {
-            $formattedKeyValues[$this->prefix.$keyToPrefix] = $singleValue;
+        foreach ($values as $key => $value) {
+            $prefixedValues[$this->prefix.$key] = $value;
         }
 
-        $this->memcached->setMulti($formattedKeyValues, $minutes * 60);
+        $this->memcached->setMulti($prefixedValues, $minutes * 60);
     }
 
     /**

diff --git a/src/Illuminate/Cache/NullStore.php b/src/Illuminate/Cache/NullStore.php
@@ -6,7 +6,7 @@
 
 class NullStore extends TaggableStore implements Store
 {
-    use DefaultMultipleTrait;
+    use RetrievesMultipleKeys;
 
     /**
      * The array of stored values.

diff --git a/src/Illuminate/Cache/RedisStore.php b/src/Illuminate/Cache/RedisStore.php
@@ -46,7 +46,7 @@ public function __construct(Redis $redis, $prefix = '', $connection = 'default')
     /**
      * Retrieve an item from the cache by key.
      *
-     * @param  string  $key
+     * @param  string|array  $key
      * @return mixed
      */
     public function get($key)
@@ -59,28 +59,26 @@ public function get($key)
     /**
      * Retrieve multiple items from the cache by key.
      *
-     * Items not found in the cache will have a null value for the key.
+     * Items not found in the cache will have a null value.
      *
      * @param  array  $keys
      * @return array
      */
-    public function getMultiple(array $keys)
+    public function many(array $keys)
     {
-        $returnValues = [];
-        $prefixedKeys = [];
+        $return = [];
 
-        foreach ($keys as $keyToPrefix) {
-            $prefixedKeys[] = $this->prefix.$keyToPrefix;
-        }
+        $prefixedKeys = array_map(function ($key) {
+            return $this->prefix.$key;
+        }, $keys);
 
-        $cacheValues = $this->connection()->mget($prefixedKeys);
+        $values = $this->connection()->mget($prefixedKeys);
 
-        foreach ($cacheValues as $i => $value) {
-            $key = $keys[$i];
-            $returnValues[$key] = is_numeric($value) ? $value : unserialize($value);
+        foreach ($values as $index => $value) {
+            $return[$keys[$index]] = is_numeric($value) ? $value : unserialize($value);
         }
 
-        return $returnValues;
+        return $return;
     }
 
     /**
@@ -101,18 +99,18 @@ public function put($key, $value, $minutes)
     }
 
     /**
-     * Store multiple items in the cache for a set number of minutes.
+     * Store multiple items in the cache for a given number of minutes.
      *
      * @param  array  $values
      * @param  int  $minutes
      * @return void
      */
-    public function putMultiple(array $values, $minutes)
+    public function putMany(array $values, $minutes)
     {
         $this->connection()->multi();
 
-        foreach ($values as $key => $singleValue) {
-            $this->put($key, $singleValue, $minutes);
+        foreach ($values as $key => $value) {
+            $this->put($key, $value, $minutes);
         }
 
         $this->connection()->exec();

diff --git a/src/Illuminate/Cache/Repository.php b/src/Illuminate/Cache/Repository.php
@@ -6,6 +6,7 @@
 use DateTime;
 use ArrayAccess;
 use Carbon\Carbon;
+use InvalidArgumentException;
 use Illuminate\Contracts\Cache\Store;
 use Illuminate\Support\Traits\Macroable;
 use Illuminate\Contracts\Events\Dispatcher;
@@ -105,6 +106,10 @@ public function has($key)
      */
     public function get($key, $default = null)
     {
+        if (is_array($key)) {
+            return $this->many($key);
+        }
+
         $value = $this->store->get($key);
 
         if (is_null($value)) {
@@ -118,6 +123,37 @@ public function get($key, $default = null)
         return $value;
     }
 
+    /**
+     * Retrieve multiple items from the cache by key.
+     *
+     * Items not found in the cache will have a null value.
+     *
+     * @param  array  $keys
+     * @return array
+     */
+    public function many(array $keys)
+    {
+        $normalizedKeys = [];
+
+        foreach ($keys as $key => $value) {
+            $normalizedKeys[] = is_string($key) ? $key : $value;
+        }
+
+        $values = $this->store->many($normalizedKeys);
+
+        foreach ($values as $key => &$value) {
+            if (is_null($value)) {
+                $this->fireCacheEvent('missed', [$key]);
+
+                $value = isset($keys[$key]) ? value($keys[$key]) : null;
+            } else {
+                $this->fireCacheEvent('hit', [$key, $value]);
+            }
+        }
+
+        return $values;
+    }
+
     /**
      * Retrieve an item from the cache and delete it.
      *
@@ -142,8 +178,12 @@ public function pull($key, $default = null)
      * @param  \DateTime|int  $minutes
      * @return void
      */
-    public function put($key, $value, $minutes)
+    public function put($key, $value, $minutes = null)
     {
+        if (is_array($key) && filter_var($value, FILTER_VALIDATE_INT) !== false) {
+            return $this->putMany($key, $value);
+        }
+
         $minutes = $this->getMinutes($minutes);
 
         if (! is_null($minutes)) {
@@ -153,6 +193,26 @@ public function put($key, $value, $minutes)
         }
     }
 
+    /**
+     * Store multiple items in the cache for a given number of minutes.
+     *
+     * @param  array  $values
+     * @param  int  $minutes
+     * @return void
+     */
+    public function putMany(array $values, $minutes)
+    {
+        $minutes = $this->getMinutes($minutes);
+
+        if (! is_null($minutes)) {
+            $this->store->putMany($values, $minutes);
+
+            foreach ($values as $key => $value) {
+                $this->fireCacheEvent('write', [$key, $value, $minutes]);
+            }
+        }
+    }
+
     /**
      * Store an item in the cache if the key does not exist.
      *

diff --git a/src/Illuminate/Cache/TaggedCache.php b/src/Illuminate/Cache/TaggedCache.php
@@ -9,7 +9,7 @@
 
 class TaggedCache implements Store
 {
-    use DefaultMultipleTrait;
+    use RetrievesMultipleKeys;
 
     /**
      * The cache store implementation.
@@ -52,7 +52,7 @@ public function has($key)
     /**
      * Retrieve an item from the cache by key.
      *
-     * @param  string  $key
+     * @param  string|array  $key
      * @param  mixed   $default
      * @return mixed
      */