adjustments from PR

StephenClouse · StephenClouse · commit fd178b46b365 · 2019-05-09T14:09:05.000-05:00
diff --git a/src/Symfony/Component/Cache/CHANGELOG.md b/src/Symfony/Component/Cache/CHANGELOG.md
@@ -1,13 +1,17 @@
 CHANGELOG
 =========
 
+4.4.0
+-----
+
+ * added support for connecting to Redis Sentinel clusters
+
 4.3.0
 -----
 
  * removed `psr/simple-cache` dependency, run `composer require psr/simple-cache` if you need it
  * deprecated all PSR-16 adapters, use `Psr16Cache` or `Symfony\Contracts\Cache\CacheInterface` implementations instead
  * deprecated `SimpleCacheAdapter`, use `Psr16Adapter` instead
- * added support for connecting to Redis Sentinel clusters
 
 4.2.0
 -----
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterSentinelTest.php b/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterSentinelTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Cache\Tests\Adapter;
 
 use Symfony\Component\Cache\Adapter\AbstractAdapter;
+use Symfony\Component\Cache\Adapter\RedisAdapter;
 
 class RedisAdapterSentinelTest extends AbstractRedisAdapterTest
 {
@@ -29,4 +30,14 @@ public static function setupBeforeClass()
 
         self::$redis = AbstractAdapter::createConnection('redis:?host['.str_replace(' ', ']&host[', $hosts).']', ['redis_sentinel' => $service]);
     }
+
+    /**
+     * @expectedException \Symfony\Component\Cache\Exception\InvalidArgumentException
+     * @expectedExceptionMessage Invalid Redis DSN: cannot use both redis_cluster and redis_sentinel at the same time
+     */
+    public function testInvalidDSNHasBothClusterAndSentinel()
+    {
+        $dsn = 'redis:?host[redis1]&host[redis2]&host[redis3]&redis_cluster=1&redis_sentinel=mymaster';
+        RedisAdapter::createConnection($dsn);
+    }
 }
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -38,7 +38,7 @@ trait RedisTrait
         'tcp_keepalive' => 0,
         'lazy' => null,
         'redis_cluster' => false,
-        'redis_sentinel' => false,
+        'redis_sentinel' => null,
         'dbindex' => 0,
         'failover' => 'none',
     ];
@@ -153,7 +153,7 @@ public static function createConnection($dsn, array $options = [])
 
         $params += $query + $options + self::$defaultConnectionOptions;
 
-        if (null === $params['class'] && !$params['redis_sentinel'] && \extension_loaded('redis')) {
+        if (null === $params['class'] && !isset($params['redis_sentinel']) && \extension_loaded('redis')) {
             $class = $params['redis_cluster'] ? \RedisCluster::class : (1 < \count($hosts) ? \RedisArray::class : \Redis::class);
         } else {
             $class = null === $params['class'] ? \Predis\Client::class : $params['class'];
@@ -251,7 +251,10 @@ public static function createConnection($dsn, array $options = [])
         } elseif (is_a($class, \Predis\Client::class, true)) {
             if ($params['redis_cluster']) {
                 $params['cluster'] = 'redis';
-            } elseif ($params['redis_sentinel']) {
+                if (isset($params['redis_sentinel'])) {
+                    throw new InvalidArgumentException(sprintf('Invalid Redis DSN: cannot use both redis_cluster and redis_sentinel at the same time: %s', $dsn));
+                }
+            } elseif (isset($params['redis_sentinel'])) {
                 $params['replication'] = 'sentinel';
                 $params['service'] = $params['redis_sentinel'];
             }

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`namespace Symfony\Component\Cache\Tests\Adapter;`
`13`	`13`
`14`	`14`	`use Symfony\Component\Cache\Adapter\AbstractAdapter;`
	`15`	`+use Symfony\Component\Cache\Adapter\RedisAdapter;`
`15`	`16`
`16`	`17`	`class RedisAdapterSentinelTest extends AbstractRedisAdapterTest`
`17`	`18`	`{`
`@@ -29,4 +30,14 @@ public static function setupBeforeClass()`
`29`	`30`
`30`	`31`	`self::$redis = AbstractAdapter::createConnection('redis:?host['.str_replace(' ', ']&host[', $hosts).']', ['redis_sentinel' => $service]);`
`31`	`32`	`}`
	`33`	`+`
	`34`	`+ /**`
	`35`	`+ * @expectedException \Symfony\Component\Cache\Exception\InvalidArgumentException`
	`36`	`+ * @expectedExceptionMessage Invalid Redis DSN: cannot use both redis_cluster and redis_sentinel at the same time`
	`37`	`+ */`
	`38`	`+ public function testInvalidDSNHasBothClusterAndSentinel()`
	`39`	`+ {`
	`40`	`+ $dsn = 'redis:?host[redis1]&host[redis2]&host[redis3]&redis_cluster=1&redis_sentinel=mymaster';`
	`41`	`+ RedisAdapter::createConnection($dsn);`
	`42`	`+ }`
`32`	`43`	`}`