Update composer.json

README.md

@@ -1,6 +1,10 @@
 # phpcache
 
 [![Build Status](https://travis-ci.org/Mactronique/phpcache.svg?branch=master)](https://travis-ci.org/Mactronique/phpcache)
+[![Dependency Status](https://www.versioneye.com/user/projects/55c2676e653762001a00287f/badge.svg?style=flat)](https://www.versioneye.com/user/projects/55c2676e653762001a00287f)
+[![Latest Stable Version](https://poser.pugx.org/mactronique/phpcache/v/stable)](https://packagist.org/packages/mactronique/phpcache)
+[![Latest Unstable Version](https://poser.pugx.org/mactronique/phpcache/v/unstable)](https://packagist.org/packages/mactronique/phpcache)
+[![License](https://poser.pugx.org/mactronique/phpcache/license)](https://packagist.org/packages/mactronique/phpcache)
 
 ## Supported driver
 

composer.json

@@ -6,12 +6,11 @@
     "authors": [
         {
             "name": "Jean-Baptiste Nahan",
-            "email": "jbnahan@gmail.com"
+            "email": "macintoshplus@users.noreply.github.com"
         }
     ],
     "require": {
-        "php": ">=5.4",
-        "jms/serializer": "~1.0"
+        "php": ">=5.4"
     },
     "require-dev": {
         "atoum/atoum": "master-dev"
@@ -31,5 +30,6 @@
         "branch-alias": {
             "dev-master": "1.x-dev"
         }
-    }
+    },
+    "abandoned": "psr/simple-cache"
 }

lib/Mactronique/PhpCache/Driver/RedisDriver.php

@@ -21,10 +21,10 @@ class RedisDriver implements Driver
     public function checkDriver()
     {
         if (!class_exists('Redis')) {
-            throw new DriverRequirementFailException("Redis extension not installed", self::NAME);
+            throw new DriverRequirementFailException('Redis extension not installed', self::NAME);
         }
     }
-    
+
     /**
      * @return string Driver name
      */
@@ -35,6 +35,7 @@ class RedisDriver implements Driver
 
     /**
      * @param string $key
+     *
      * @return mixed
      */
     public function get($key)
@@ -43,31 +44,38 @@ class RedisDriver implements Driver
         $value = $this->client->get($key);
 
         if ($value == false) {
-            return null;
+            return;
         }
+
         return $value;
     }
 
     /**
      * @param string $key
-     * @param mixed $value
-     * @param integer $ttl
+     * @param mixed  $value
+     * @param int    $ttl
+     *
      * @return mixed
      */
     public function set($key, $value, $ttl = null)
     {
         $this->connectServer();
-        return $this->client->set($keyword, $value, (null === $ttl)? 0:$ttl);
+        $this->client->set($key, $value);
+        if (null !== $ttl) {
+            $this->client->setTimeout($key, $ttl);
+        }
     }
 
     /**
      * @param string $key
-     * @return boolean
+     *
+     * @return bool
      */
     public function exists($key)
     {
         $this->connectServer();
-        return (null !== $this->client->exists($key));
+
+        return $this->client->exists($key);
     }
 
     /**
@@ -76,16 +84,18 @@ class RedisDriver implements Driver
     public function remove($key)
     {
         $this->connectServer();
+
         return $this->client->delete($key);
     }
 
     /**
-     * Remove all keys and value from cache
+     * Remove all keys and value from cache.
      */
     public function clean()
     {
         $this->connectServer();
         $this->client->flushDB();
+
         return true;
     }
 
@@ -93,14 +103,18 @@ class RedisDriver implements Driver
     {
         if (null === $this->client) {
             $host = $this->config['host'];
-            $port = array_key_exists('port', $this->config)? (int)$this->config['port']:6379;
-            $password = (array_key_exists('password', $this->config))? $this->config['password']:'';
-            $database = (array_key_exists('database', $this->config)? (int)$this->config['database']:null);
-            $timeout = (array_key_exists('timeout', $this->config))? (int)$this->config['timeout']:1;
+            $port = array_key_exists('port', $this->config) ? (int) $this->config['port'] : 6379;
+            $password = (array_key_exists('password', $this->config)) ? $this->config['password'] : '';
+            $database = (array_key_exists('database', $this->config) ? (int) $this->config['database'] : null);
+            $timeout = (array_key_exists('timeout', $this->config)) ? (int) $this->config['timeout'] : 1;
 
-            $this->client = new Redis();
+            $this->client = new \Redis();
             if (!$this->client->connect($host, $port, $timeout)) {
-                throw new ServerException("Error Unable to connect to server");
+                throw new ServerException('Error Unable to connect to server');
+            }
+
+            if (!empty($password)) {
+                $this->client->auth($password);
             }
 
             if (null !== $database) {

lib/Mactronique/PhpCache/Service/PhpCache.php

@@ -51,7 +51,7 @@ class PhpCache
      */
     public function set($key, $value, $ttl = null, $driverName = null)
     {
-        return $this->getDriver($driverName)->set($key, $value, $ttl = null);
+        return $this->getDriver($driverName)->set($key, $value, $ttl);
     }
 
     /**