prepare 3.9.1 release (#152)

Author: LaunchDarklyReleaseBot

src/LaunchDarkly/Impl/Integrations/PHPRedisFeatureRequester.php

@@ -16,7 +16,10 @@ public function __construct($baseUri, $sdkKey, $options)
     {
         parent::__construct($baseUri, $sdkKey, $options);
 
-        $this->_prefix = isset($options['redis_prefix']) ? $options['redis_prefix'] : 'launchdarkly';
+        $this->_prefix = isset($options['redis_prefix']) ? $options['redis_prefix'] : null;
+        if ($this->_prefix === null || $this->_prefix === '') {
+            $this->_prefix = 'launchdarkly';
+        }
 
         if (isset($this->_options['phpredis_client']) && $this->_options['phpredis_client'] instanceof \Redis) {
             $this->_redisInstance = $this->_options['phpredis_client'];
@@ -32,13 +35,13 @@ public function __construct($baseUri, $sdkKey, $options)
     protected function readItemString($namespace, $key)
     {
         $redis = $this->getConnection();
-        return $redis->hget($namespace, $key);
+        return $redis->hget("$this->_prefix:$namespace", $key);
     }
 
     protected function readItemStringList($namespace)
     {
         $redis = $this->getConnection();
-        $raw = $redis->hgetall($namespace);
+        $raw = $redis->hgetall("$this->_prefix:$namespace");
         return $raw ? array_values($raw) : null;
     }
 
@@ -56,9 +59,8 @@ protected function getConnection()
             $this->_redisOptions["host"],
             $this->_redisOptions["port"],
             $this->_redisOptions["timeout"],
-            'x'
+            'LaunchDarkly'
         );
-        $redis->setOption(\Redis::OPT_PREFIX, "$this->_prefix:");	// use custom prefix on all keys
         return $this->_redisInstance = $redis;
     }
 }

tests/PHPRedisFeatureRequesterWithClientTest.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace LaunchDarkly\Tests;
+
+use LaunchDarkly\Integrations\PHPRedis;
+
+/**
+ * @requires extension redis
+ */
+class PHPRedisFeatureRequesterWithClientTest extends FeatureRequesterTestBase
+{
+    const CLIENT_PREFIX = 'clientprefix';
+    const LD_PREFIX = 'ldprefix';
+
+    /** @var \Redis */
+    private static $redisClient;
+    
+    public static function setUpBeforeClass()
+    {
+        if (!static::isSkipDatabaseTests()) {
+            $redis = new \Redis();
+            $redis->connect('127.0.0.1', 6379);
+            $redis->setOption(\Redis::OPT_PREFIX, self::CLIENT_PREFIX);
+            self::$redisClient = $redis;
+
+            // Setting a prefix parameter on the Redis client causes it to prepend
+            // that string to every key *in addition to* the other prefix that the SDK
+            // integration is applying (LD_PREFIX). This is done transparently so we
+            // do not need to add CLIENT_PREFIX in putItem below. We're doing it so we
+            // can be sure that the PHPRedisFeatureRequester really is using the same
+            // client we passed to it; if it didn't, the tests would fail because
+            // putItem was creating keys with both prefixes but PHPRedisFeatureRequester
+            // was looking for keys with only one prefix.
+        }
+    }
+
+    protected function isDatabaseTest()
+    {
+        return true;
+    }
+    
+    protected function makeRequester()
+    {
+        $factory = PHPRedis::featureRequester();
+        return $factory('', '', array(
+            'redis_prefix' => self::LD_PREFIX,
+            'phpredis_client' => self::$redisClient
+        ));
+    }
+
+    protected function putItem($namespace, $key, $version, $json)
+    {
+        self::$redisClient->hset(self::LD_PREFIX . ":$namespace", $key, $json);
+    }
+
+    protected function deleteExistingData()
+    {
+        self::$redisClient->flushdb();
+    }
+}

tests/RedisFeatureRequesterWithClientTest.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace LaunchDarkly\Tests;
+
+use LaunchDarkly\Integrations\Redis;
+use Predis\Client;
+
+class RedisFeatureRequesterWithClientTest extends FeatureRequesterTestBase
+{
+    const CLIENT_PREFIX = 'clientprefix';
+    const LD_PREFIX = 'ldprefix';
+
+    /** @var ClientInterface */
+    private static $predisClient;
+    
+    public static function setUpBeforeClass()
+    {
+        if (!static::isSkipDatabaseTests()) {
+            self::$predisClient = new Client(array(), array(
+                'prefix' => self::CLIENT_PREFIX
+            ));
+            // Setting a prefix parameter on the Predis\Client causes it to prepend
+            // that string to every key *in addition to* the other prefix that the SDK
+            // integration is applying (LD_PREFIX). This is done transparently so we
+            // do not need to add CLIENT_PREFIX in putItem below. We're doing it so we
+            // can be sure that the RedisFeatureRequester really is using the same
+            // client we passed to it; if it didn't, the tests would fail because
+            // putItem was creating keys with both prefixes but RedisFeatureRequester
+            // was looking for keys with only one prefix.
+        }
+    }
+
+    protected function isDatabaseTest()
+    {
+        return true;
+    }
+    
+    protected function makeRequester()
+    {
+        $factory = Redis::featureRequester();
+        return $factory('', '', array(
+            'redis_prefix' => self::LD_PREFIX,
+            'predis_client' => self::$predisClient
+        ));
+    }
+
+    protected function putItem($namespace, $key, $version, $json)
+    {
+        self::$predisClient->hset(self::LD_PREFIX . ":$namespace", $key, $json);
+    }
+
+    protected function deleteExistingData()
+    {
+        self::$predisClient->flushdb();
+    }
+}