Merge pull request #8 from Traackr/BI-8371-redis-version-regression

BI-8371: Allow Credis profile version to be passed in.

Author: rajivraman

.travis.yml

@@ -1,11 +1,9 @@
 language: php
 
 php:
-  - 5.3
-  - 5.4
-  - 5.5
   - 5.6
-
+  - 7.0
+  - 7.1
 before_script:
   - wget http://getcomposer.org/composer.phar
   - php composer.phar install --dev

README.md

@@ -40,6 +40,7 @@ CakePHP:
        'engine' => 'Fallback',
        'name' => "post_data",
        'primary' => array(
+          'profile' => '2.8', // optional, if you want to hardcode a predis profile to use
           'engine' => 'RedisTree',
           'server' => 'redis-server',
           'port' => 6379,

src/RedisTreeEngine.php

@@ -15,7 +15,7 @@ class RedisTreeEngine extends CacheEngine
      * Redis wrapper.
      */
     protected $redis = null;
-    
+
     /**
      * Needs to be protected, not private since it's reset in RedisTreeMockEngine
      */
@@ -56,11 +56,19 @@ public function init($settings = array())
 
         if (!isset($this->redis)) {
             try {
-                $this->redis = new Predis\Client(array(
-                    'scheme' => 'tcp',
-                    'host' => $this->settings['server'],
-                    'port' => $this->settings['port'],
-                ));
+                if (isset($settings['profile'])) {
+                    $this->redis = new Predis\Client(array(
+                        'scheme' => 'tcp',
+                        'host' => $this->settings['server'],
+                        'port' => $this->settings['port'],
+                    ), array('profile' => $settings['profile']));
+                } else {
+                    $this->redis = new Predis\Client(array(
+                        'scheme' => 'tcp',
+                        'host' => $this->settings['server'],
+                        'port' => $this->settings['port'],
+                    ));
+                }
             } catch (Exception $e) {
                 // If creation fails, return false
                 return false;
@@ -308,12 +316,12 @@ public function delete($key)
     private function _mdelete($keys)
     {
         $finalKeys = array();
-        
+
         foreach ($keys as $key) {
             // keys() is an expensive call; only call it if we need to (i.e. if there actually is a wildcard);
             // the chars "?*[" seem to be the right ones to listen for according to: http://redis.io/commands/KEYS
             if (preg_match('/[\?\*\[]/', $key)) {
-            
+
                 if ($this->supportsScan) {
                     $currKeys = array();
                     foreach (new Iterator\Keyspace($this->redis, $key) as $currKey) {
@@ -337,7 +345,7 @@ private function _mdelete($keys)
             return 0;
         }
     }
-    
+
     /**
      * Internal single-val delete.
      * @param $key
@@ -383,7 +391,7 @@ public function clear($check = false)
         if ($check) {
             return true;
         }
-        
+
         if ($this->supportsScan) {
             $keys = array();
             foreach (new Iterator\Keyspace($this->redis, $this->settings['prefix'] . '*') as $currKey) {