symfony
diff --git a/‎src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/Cache/Adapter/RedisAdapter.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Adapter/RedisAdapter.php
+22-13Lines changed: 22 additions & 13 deletions b/‎src/Symfony/Component/Cache/Adapter/RedisAdapter.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Adapter/RedisAdapter.php
+22-13Lines changed: 22 additions & 13 deletions
@@ -227,7 +227,7 @@ public function deleteItems(array $keys)
 
         $ok = true;
 
-        // When bulk-save failed, retry each item individually
+        // When bulk-delete failed, retry each item individually
         foreach ($ids as $key => $id) {
             try {
                 $e = null;
 
@@ -19,30 +19,34 @@
 class RedisAdapter extends AbstractAdapter
 {
     private $redis;
+    private $namespace;
 
     public function __construct(\Redis $redisConnection, $namespace = '', $defaultLifetime = 0)
     {
-        $this->redis = $redisConnection;
-
         if (preg_match('#[^-+_.A-Za-z0-9]#', $namespace, $match)) {
             throw new InvalidArgumentException(sprintf('RedisAdapter namespace contains "%s" but only characters in [-+_.A-Za-z0-9] are allowed.', $match[0]));
         }
+        $this->redis = $redisConnection;
+        $this->redis->setOption(\Redis::OPT_PREFIX, $namespace);
+        $this->namespace = $namespace;
 
-        parent::__construct($namespace, $defaultLifetime);
+        parent::__construct('', $defaultLifetime);
     }
 
     /**
      * {@inheritdoc}
      */
     protected function doFetch(array $ids)
     {
-        $values = $this->redis->mget($ids);
-        $index = 0;
-        $result = [];
-
-        foreach ($ids as $id) {
-            if (false !== $value = $values[$index++]) {
-                $result[$id] = unserialize($value);
+        $result = array();
+
+        if ($ids) {
+            $values = $this->redis->mget($ids);
+            $index = 0;
+            foreach ($ids as $id) {
+                if (false !== $value = $values[$index++]) {
+                    $result[$id] = unserialize($value);
+                }
             }
         }
 
@@ -62,14 +66,14 @@ protected function doHave($id)
      */
     protected function doClear($namespace)
     {
-        if (!isset($namespace[0])) {
+        if (!isset($this->namespace[0])) {
             $this->redis->flushDB();
         } else {
             // As documented in Redis documentation (http://redis.io/commands/keys) using KEYS
             // can hang your server when it is executed against large databases (millions of items).
             // Whenever you hit this scale, it is advised to deploy one Redis database per cache pool
             // instead of using namespaces, so that the above FLUSHDB is used instead.
-            $this->redis->eval(sprintf("local keys=redis.call('KEYS','%s*') for i=1,#keys,5000 do redis.call('DEL',unpack(keys,i,math.min(i+4999,#keys))) end", $namespace));
+            $this->redis->eval(sprintf("local keys=redis.call('KEYS','%s*') for i=1,#keys,5000 do redis.call('DEL',unpack(keys,i,math.min(i+4999,#keys))) end", $this->namespace));
         }
 
         return true;
@@ -80,7 +84,9 @@ protected function doClear($namespace)
      */
     protected function doDelete(array $ids)
     {
-        $this->redis->del($ids);
+        if ($ids) {
+            $this->redis->del($ids);
+        }
 
         return true;
     }
@@ -101,6 +107,9 @@ protected function doSave(array $values, $lifetime)
             }
         }
 
+        if (!$serialized) {
+            return $failed;
+        }
         if ($lifetime > 0) {
             $pipe = $this->redis->multi(\Redis::PIPELINE);
             foreach ($serialized as $id => $value) {