cluster support for predis dsn

alekitto · alekitto · commit ff2366c6a8be · 2018-09-25T01:59:01.000+02:00
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/PredisRedisClusterAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/PredisRedisClusterAdapterTest.php
@@ -11,14 +11,17 @@
 
 namespace Symfony\Component\Cache\Tests\Adapter;
 
+use Symfony\Component\Cache\Adapter\RedisAdapter;
+
 class PredisRedisClusterAdapterTest extends AbstractRedisAdapterTest
 {
     public static function setupBeforeClass()
     {
         if (!$hosts = getenv('REDIS_CLUSTER_HOSTS')) {
             self::markTestSkipped('REDIS_CLUSTER_HOSTS env var is not defined.');
         }
-        self::$redis = new \Predis\Client(explode(' ', $hosts), array('cluster' => 'redis'));
+
+        self::$redis = RedisAdapter::createConnection('redis://'.str_replace(' ', ',', $hosts), array('class' => \Predis\Client::class, 'cluster' => 'server'));
     }
 
     public static function tearDownAfterClass()
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -185,7 +185,9 @@ public static function createConnection($dsn, array $options = array())
             $params['scheme'] = $scheme;
             $params['database'] = $params['dbindex'] ?: null;
             $params['password'] = $auth;
-            $redis = new $class((new Factory())->create($params));
+            $redis = new $class($params, array(
+                'cluster' => 'server' === $params['cluster'] ? 'redis' : null,
+            ));
         } elseif (class_exists($class, false)) {
             throw new InvalidArgumentException(sprintf('"%s" is not a subclass of "Redis" or "Predis\Client"', $class));
         } else {

Original file line number	Diff line number	Diff line change
`@@ -11,14 +11,17 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Cache\Tests\Adapter;`
`13`	`13`
	`14`	`+use Symfony\Component\Cache\Adapter\RedisAdapter;`
	`15`	`+`
`14`	`16`	`class PredisRedisClusterAdapterTest extends AbstractRedisAdapterTest`
`15`	`17`	`{`
`16`	`18`	`public static function setupBeforeClass()`
`17`	`19`	`{`
`18`	`20`	`if (!$hosts = getenv('REDIS_CLUSTER_HOSTS')) {`
`19`	`21`	`self::markTestSkipped('REDIS_CLUSTER_HOSTS env var is not defined.');`
`20`	`22`	`}`
`21`		`- self::$redis = new \Predis\Client(explode(' ', $hosts), array('cluster' => 'redis'));`
	`23`	`+`
	`24`	`+ self::$redis = RedisAdapter::createConnection('redis://'.str_replace(' ', ',', $hosts), array('class' => \Predis\Client::class, 'cluster' => 'server'));`
`22`	`25`	`}`
`23`	`26`
`24`	`27`	`public static function tearDownAfterClass()`