Commitec7d4aa

committed

Allow RedisCluster class for RedisSessionHandler

1 parent0874f70 commitec7d4aaCopy full SHA for ec7d4aa

File tree

+10

-4

lines changed

src/Symfony/Component/HttpFoundation
- Session/Storage/Handler
  - RedisSessionHandler.php
- Tests/Session/Storage/Handler
  - PredisClusterSessionHandlerTest.php

+10

-4

lines changed

Lines changed: 9 additions & 3 deletions

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`	`publicfunction__construct($redis,array$options =array())`
`42`	`42`	`{`
`43`		`-if (!$redisinstanceof \Redis && !$redisinstanceof \RedisArray && !$redisinstanceof \Predis\Client && !$redisinstanceof RedisProxy) {`
	`43`	`+if (`
	`44`	`+ !$redisinstanceof \Redis &&`
	`45`	`+ !$redisinstanceof \RedisArray &&`
	`46`	`+ !$redisinstanceof \RedisCluster &&`
	`47`	`+ !$redisinstanceof \Predis\Client &&`
	`48`	`+ !$redisinstanceof RedisProxy`
	`49`	`+ ) {`
`44`	`50`	`thrownew \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`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,6 @@ class PredisClusterSessionHandlerTest extends AbstractRedisSessionHandlerTestCas`
`17`	`17`	`{`
`18`	`18`	`protectedfunctioncreateRedisClient(string$host):Client`
`19`	`19`	`{`
`20`		`-returnnewClient(array(array('host' =>$host)));`
	`20`	`+returnnewClient(array(array('host' =>$host)));`
`21`	`21`	`}`
`22`	`22`	`}`

Comments

(0)