Merge pull request #629 from Geolim4/master

Implemented #627

Author: Geolim4

lib/Phpfastcache/Drivers/Predis/Config.php

@@ -37,6 +37,11 @@ class Config extends ConfigurationOption
      */
     protected $predisClient;
 
+    /**
+     * @var string
+     */
+    protected $optPrefix = '';
+
     /**
      * @return string
      */
@@ -139,4 +144,24 @@ public function setPredisClient(\Predis\Client $predisClient = null): Config
         $this->predisClient = $predisClient;
         return $this;
     }
+
+    /**
+     * @return string
+     * @since 7.0.2
+     */
+    public function getOptPrefix(): string
+    {
+        return $this->optPrefix;
+    }
+
+    /**
+     * @param string $optPrefix
+     * @return Config
+     * @since 7.0.2
+     */
+    public function setOptPrefix(string $optPrefix): Config
+    {
+        $this->optPrefix = trim($optPrefix);
+        return $this;
+    }
 }

lib/Phpfastcache/Drivers/Predis/Driver.php

@@ -73,13 +73,19 @@ protected function driverConnect(): bool
             return true;
         }
 
+        $options = [];
+
+        if($this->getConfig()->getOptPrefix()){
+            $options['prefix'] = $this->getConfig()->getOptPrefix();
+        }
+
         if (!empty($this->getConfig()->getPath())) {
             $this->instance = new PredisClient([
                 'scheme' => 'unix',
                 'path' => $this->getConfig()->getPath(),
-            ]);
+            ], $options);
         } else {
-            $this->instance = new PredisClient($this->getConfig()->getPredisConfigArray());
+            $this->instance = new PredisClient($this->getConfig()->getPredisConfigArray(), $options);
         }
 
         try {

lib/Phpfastcache/Drivers/Redis/Config.php

@@ -43,6 +43,11 @@ class Config extends ConfigurationOption
      */
     protected $redisClient;
 
+    /**
+     * @var string
+     */
+    protected $optPrefix = '';
+
     /**
      * @return string
      */
@@ -150,4 +155,24 @@ public function setRedisClient(RedisClient $redisClient = null): Config
         $this->redisClient = $redisClient;
         return $this;
     }
+
+    /**
+     * @return string
+     * @since 7.0.2
+     */
+    public function getOptPrefix(): string
+    {
+        return $this->optPrefix;
+    }
+
+    /**
+     * @param string $optPrefix
+     * @return Config
+     * @since 7.0.2
+     */
+    public function setOptPrefix(string $optPrefix): Config
+    {
+        $this->optPrefix = trim($optPrefix);
+        return $this;
+    }
 }

lib/Phpfastcache/Drivers/Redis/Driver.php

@@ -81,6 +81,10 @@ protected function driverConnect(): bool
             return false;
         }
 
+        if($this->getConfig()->getOptPrefix()){
+            $this->instance->setOption(RedisClient::OPT_PREFIX, $this->getConfig()->getOptPrefix());
+        }
+
         if (!$this->getConfig()->getPath()) {
             if ($this->getConfig()->getPassword() && !$this->instance->auth($this->getConfig()->getPassword())) {
                 return false;

tests/issues/Github-627.test.php

@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * @author Khoa Bui (khoaofgod)  <[email protected]> https://www.phpfastcache.com
+ * @author Georges.L (Geolim4)  <[email protected]>
+ */
+
+use Phpfastcache\CacheManager;
+use Phpfastcache\Helper\TestHelper;
+use Phpfastcache\Drivers\Redis\Config as RedisConfig;
+use Phpfastcache\Drivers\Predis\Config as PredisConfig;
+
+
+chdir(__DIR__);
+require_once __DIR__ . '/../../vendor/autoload.php';
+$testHelper = new TestHelper('Github issue #627 - Redis/Predis "prefix" option');
+$redisInstance = CacheManager::getInstance('Redis', new RedisConfig(['optPrefix' => uniqid('pfc', true) . '_']));
+$predisInstance = CacheManager::getInstance('Predis', new PredisConfig(['optPrefix' => uniqid('pfc', true) . '_']));
+
+$testHelper->printInfoText('Testing Redis 1/2');
+
+/**
+ * Clear the cache to avoid
+ * unexpected results
+ */
+$redisInstance->clear();
+
+$cacheKey = uniqid('ck', true);
+$string = uniqid('pfc', true);
+$testHelper->printText('Preparing test item...');
+
+/**
+ * Setup the cache item
+ */
+$cacheItem = $redisInstance->getItem($cacheKey);
+$cacheItem->set($string);
+$redisInstance->save($cacheItem);
+unset($cacheItem);
+$redisInstance->detachAllItems();
+
+if($redisInstance->getItem($cacheKey)->isHit()){
+    $testHelper->printPassText('The cache item has been found in cache');
+}else{
+    $testHelper->printFailText('The cache item was not found in cache');
+}
+
+$testHelper->printInfoText('Testing Predis 2/2');
+
+/**
+ * Clear the cache to avoid
+ * unexpected results
+ */
+$predisInstance->clear();
+
+$cacheKey = uniqid('ck', true);
+$string = uniqid('pfc', true);
+$testHelper->printText('Preparing test item...');
+
+/**
+ * Setup the cache item
+ */
+$cacheItem = $predisInstance->getItem($cacheKey);
+$cacheItem->set($string);
+$predisInstance->save($cacheItem);
+unset($cacheItem);
+$predisInstance->detachAllItems();
+
+if($predisInstance->getItem($cacheKey)->isHit()){
+    $testHelper->printPassText('The cache item has been found in cache');
+}else{
+    $testHelper->printFailText('The cache item was not found in cache');
+}
+
+
+$testHelper->terminateTest();