more updates

Author: mmelograno

src/SplitIO/Component/Cache/Storage/Adapter/PRedis.php

@@ -14,6 +14,9 @@ class PRedis implements CacheStorageAdapterInterface
     /** @var \Predis\Client|null  */
     private $client = null;
 
+    /** @var string  */
+    private $prefix = "";
+
     /**
      * @param array $options
      * @throws AdapterException
@@ -26,6 +29,10 @@ public function __construct(array $options)
         $_redisConfig = $this->getRedisConfiguration($options);
 
         $this->client = new \Predis\Client($_redisConfig['parameters'], $_redisConfig['options']);
+
+        if (isset($_redisConfig['options']['prefix'])) {
+            $this->prefix = $_redisConfig['options']['prefix'];
+        }
     }
 
     /**
@@ -179,30 +186,8 @@ public function isOnList($key, $value)
 
     public function getKeys($pattern = '*')
     {
-        $prefix = null;
-        if ($this->client->getOptions()->__isset("prefix")) {
-            $prefix = $this->client->getOptions()->__get("prefix")->getPrefix();
-        }
-
-        if ($this->client->getOptions()->__isset("cluster")) {
-            $keys = array();
-            foreach ($this->client as $nodeClient) {
-                $nodeClientKeys = $nodeClient->keys($pattern);
-                $keys = array_merge($keys, $nodeClientKeys);
-            }
-        } else {
-            $keys = $this->client->keys($pattern);
-        }
-        if ($prefix) {
-            if (is_array($keys)) {
-                foreach ($keys as $index => $key) {
-                    $keys[$index] = str_replace($prefix, '', $key);
-                }
-            } else {
-                $keys = str_replace($prefix, '', $keys);
-            }
-        }
-        return $keys;
+        $keys = $this->client->keys($pattern);
+        return str_replace($this->prefix, '', $keys);
     }
 
     private static function normalizePrefix($prefix)

src/SplitIO/Sdk/ClientInterface.php

@@ -168,8 +168,9 @@ public function isTreatment($key, $featureFlagName, $treatment);
      * @param $key
      * @param $trafficType
      * @param $eventType
-     * @param null $value
+     * @param $value
+     * @param $properties
      * @return boolean
      */
-    public function track($key, $trafficType, $eventType, $value = null);
+    public function track($key, $trafficType, $eventType, $value = null, $properties = null);
 }

src/SplitIO/Sdk/Factory/SplitFactory.php

@@ -45,9 +45,6 @@ public function __construct($sdkKey, Pool $cache, array $options = array())
         $this->options = $options;
         $this->cache = $cache;
 
-        //Block until ready
-        $this->doBUR();
-
         $eventCache = new EventsCache($cache);
         $impressionCache = new ImpressionCache($cache);
         $segmentCache = new SegmentCache($cache);
@@ -63,21 +60,6 @@ public function __construct($sdkKey, Pool $cache, array $options = array())
         $this->manager = new SplitManager($splitCache);
     }
 
-    private function doBUR()
-    {
-        /*
-            Deprecated
-            $ready =  (isset($this->options['ready']) && $this->options['ready'] > 0) ? $this->options['ready'] : null;
-
-            //Block Until Ready
-            if ($ready) {
-                if (!$this->blockUntilReady($ready)) {
-                    throw new TimeOutException("Cache data is not ready yet");
-                }
-            }
-        */
-    }
-
     /**
      * @return \SplitIO\Sdk\ClientInterface
      */

src/SplitIO/Sdk/LocalhostClient.php

@@ -253,7 +253,7 @@ public function isTreatment($key, $featureFlagName, $treatment)
     /**
      * @inheritdoc
      */
-    public function track($key, $trafficType, $eventType, $value = null)
+    public function track($key, $trafficType, $eventType, $value = null, $properties = null)
     {
         return true;
     }