Allow RedisCluster class for RedisSessionHandler

michaelperrin · michaelperrin · commit ec7d4aa1a10d · 2018-08-23T13:21:14.000-05:00
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/RedisSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/RedisSessionHandler.php
@@ -33,14 +33,20 @@ class RedisSessionHandler extends AbstractSessionHandler
      * List of available options:
      *  * prefix: The prefix to use for the keys in order to avoid collision on the Redis server.
      *
-     * @param \Redis|\RedisArray|\RedisCluster|\Predis\Client $redis
-     * @param array                                           $options An associative array of options
+     * @param \Redis|\RedisArray|\RedisCluster|\Predis\Client|RedisProxy $redis
+     * @param array                                                      $options An associative array of options
      *
      * @throws \InvalidArgumentException When unsupported client or options are passed
      */
     public function __construct($redis, array $options = array())
     {
-        if (!$redis instanceof \Redis && !$redis instanceof \RedisArray && !$redis instanceof \Predis\Client && !$redis instanceof RedisProxy) {
+        if (
+            !$redis instanceof \Redis &&
+            !$redis instanceof \RedisArray &&
+            !$redis instanceof \RedisCluster &&
+            !$redis instanceof \Predis\Client &&
+            !$redis instanceof RedisProxy
+        ) {
             throw new \InvalidArgumentException(sprintf('%s() expects parameter 1 to be Redis, RedisArray, RedisCluster or Predis\Client, %s given', __METHOD__, \is_object($redis) ? \get_class($redis) : \gettype($redis)));
         }
 
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PredisClusterSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PredisClusterSessionHandlerTest.php
@@ -17,6 +17,6 @@ class PredisClusterSessionHandlerTest extends AbstractRedisSessionHandlerTestCas
 {
     protected function createRedisClient(string $host): Client
     {
-        return  new Client(array(array('host' => $host)));
+        return new Client(array(array('host' => $host)));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -33,14 +33,20 @@ class RedisSessionHandler extends AbstractSessionHandler`
`33`	`33`	`* List of available options:`
`34`	`34`	`* * prefix: The prefix to use for the keys in order to avoid collision on the Redis server.`
`35`	`35`	`*`
`36`		`- * @param \Redis\|\RedisArray\|\RedisCluster\|\Predis\Client $redis`
`37`		`- * @param array $options An associative array of options`
	`36`	`+ * @param \Redis\|\RedisArray\|\RedisCluster\|\Predis\Client\|RedisProxy $redis`
	`37`	`+ * @param array $options An associative array of options`
`38`	`38`	`*`
`39`	`39`	`* @throws \InvalidArgumentException When unsupported client or options are passed`
`40`	`40`	`*/`
`41`	`41`	`public function __construct($redis, array $options = array())`
`42`	`42`	`{`
`43`		`- if (!$redis instanceof \Redis && !$redis instanceof \RedisArray && !$redis instanceof \Predis\Client && !$redis instanceof RedisProxy) {`
	`43`	`+ if (`
	`44`	`+ !$redis instanceof \Redis &&`
	`45`	`+ !$redis instanceof \RedisArray &&`
	`46`	`+ !$redis instanceof \RedisCluster &&`
	`47`	`+ !$redis instanceof \Predis\Client &&`
	`48`	`+ !$redis instanceof RedisProxy`
	`49`	`+ ) {`
`44`	`50`	`throw new \InvalidArgumentException(sprintf('%s() expects parameter 1 to be Redis, RedisArray, RedisCluster or Predis\Client, %s given', __METHOD__, \is_object($redis) ? \get_class($redis) : \gettype($redis)));`
`45`	`51`	`}`
`46`	`52`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,6 @@ class PredisClusterSessionHandlerTest extends AbstractRedisSessionHandlerTestCas`
`17`	`17`	`{`
`18`	`18`	`protected function createRedisClient(string $host): Client`
`19`	`19`	`{`
`20`		`- return new Client(array(array('host' => $host)));`
	`20`	`+ return new Client(array(array('host' => $host)));`
`21`	`21`	`}`
`22`	`22`	`}`