Implemented #598 // Ability to use custom predis/redis client

Author: Geolim4

lib/Phpfastcache/Drivers/Predis/Config.php

@@ -32,6 +32,11 @@ class Config extends ConfigurationOption
      */
     protected $database = 0;
 
+    /**
+     * @var \Predis\Client
+     */
+    protected $predisClient;
+
     /**
      * @return string
      */
@@ -116,4 +121,22 @@ public function getPredisConfigArray(): array
           'database' => $this->getDatabase(),
         ];
     }
+
+    /**
+     * @return \Predis\Client|null
+     */
+    public function getPredisClient()
+    {
+        return $this->predisClient;
+    }
+
+    /**
+     * @param \Predis\Client $predisClient|null
+     * @return Config
+     */
+    public function setPredisClient(\Predis\Client $predisClient = null): Config
+    {
+        $this->predisClient = $predisClient;
+        return $this;
+    }
 }

lib/Phpfastcache/Drivers/Predis/Driver.php

@@ -19,7 +19,7 @@
 use Phpfastcache\Core\Pool\{DriverBaseTrait, ExtendedCacheItemPoolInterface};
 use Phpfastcache\Entities\DriverStatistic;
 use Phpfastcache\Exceptions\{
-  PhpfastcacheInvalidArgumentException, PhpfastcacheDriverException
+  PhpfastcacheInvalidArgumentException, PhpfastcacheDriverException, PhpfastcacheLogicException
 };
 use Phpfastcache\Util\ArrayObject;
 use Predis\Client as PredisClient;
@@ -52,9 +52,26 @@ public function driverCheck(): bool
     /**
      * @return bool
      * @throws PhpfastcacheDriverException
+     * @throws PhpfastcacheLogicException
      */
     protected function driverConnect(): bool
     {
+        if ($this->instance instanceof PredisClient) {
+            throw new PhpfastcacheLogicException('Already connected to Predis server');
+        }
+
+        /**
+         * In case of an user-provided
+         * Predis client just return here
+         */
+        if($this->getConfig()->getPredisClient() instanceof PredisClient){
+            $this->instance = $this->getConfig()->getPredisClient();
+            if(!$this->instance->isConnected()){
+                $this->instance->connect();
+            }
+            return true;
+        }
+
         if(!empty($this->getConfig()->getPath())){
             $this->instance = new PredisClient([
               'scheme' => 'unix',

lib/Phpfastcache/Drivers/Redis/Config.php

@@ -9,6 +9,7 @@
 namespace Phpfastcache\Drivers\Redis;
 
 use Phpfastcache\Config\ConfigurationOption;
+use Redis as RedisClient;
 
 class Config extends ConfigurationOption
 {
@@ -37,6 +38,11 @@ class Config extends ConfigurationOption
      */
     protected $timeout = 5;
 
+    /**
+     * @var RedisClient
+     */
+    protected $redisClient;
+
     /**
      * @return string
      */
@@ -126,4 +132,22 @@ public function setTimeout(int $timeout): self
         $this->timeout = $timeout;
         return $this;
     }
+
+    /**
+     * @return RedisClient|null
+     */
+    public function getRedisClient()
+    {
+        return $this->redisClient;
+    }
+
+    /**
+     * @param RedisClient $predisClient|null
+     * @return Config
+     */
+    public function setRedisClient(RedisClient $redisClient = null): Config
+    {
+        $this->redisClient = $redisClient;
+        return $this;
+    }
 }

lib/Phpfastcache/Drivers/Redis/Driver.php

@@ -55,6 +55,19 @@ protected function driverConnect(): bool
             throw new PhpfastcacheLogicException('Already connected to Redis server');
         }
 
+        /**
+         * In case of an user-provided
+         * Redis client just return here
+         */
+        if($this->getConfig()->getRedisClient() instanceof RedisClient){
+            /**
+             * Unlike Predis, we can't test if we're are connected
+             * or not, so let's just assume that we are
+             */
+            $this->instance = $this->getConfig()->getRedisClient();
+            return true;
+        }
+
         $this->instance = $this->instance ?: new RedisClient();
 
         /**