more adjustments from PR

StephenClouse · StephenClouse · commit edf617081caf · 2019-05-13T10:42:43.000-05:00
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -252,7 +252,7 @@ public static function createConnection($dsn, array $options = [])
             if ($params['redis_cluster']) {
                 $params['cluster'] = 'redis';
                 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));
+                    throw new InvalidArgumentException(sprintf('Cannot use both "redis_cluster" and "redis_sentinel" at the same time: %s', $dsn));
                 }
             } elseif (isset($params['redis_sentinel'])) {
                 $params['replication'] = 'sentinel';
@@ -279,7 +279,7 @@ public static function createConnection($dsn, array $options = [])
             }
 
             $redis = new $class($hosts, array_diff_key($params, self::$defaultConnectionOptions));
-            if ($params['redis_sentinel']) {
+            if (isset($params['redis_sentinel'])) {
                 $redis->getConnection()->setSentinelTimeout($params['timeout']);
             }
         } elseif (class_exists($class, false)) {

Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,7 @@ public static function createConnection($dsn, array $options = [])`
`252`	`252`	`if ($params['redis_cluster']) {`
`253`	`253`	`$params['cluster'] = 'redis';`
`254`	`254`	`if (isset($params['redis_sentinel'])) {`
`255`		`- throw new InvalidArgumentException(sprintf('Invalid Redis DSN: cannot use both redis_cluster and redis_sentinel at the same time: %s', $dsn));`
	`255`	`+ throw new InvalidArgumentException(sprintf('Cannot use both "redis_cluster" and "redis_sentinel" at the same time: %s', $dsn));`
`256`	`256`	`}`
`257`	`257`	`} elseif (isset($params['redis_sentinel'])) {`
`258`	`258`	`$params['replication'] = 'sentinel';`
`@@ -279,7 +279,7 @@ public static function createConnection($dsn, array $options = [])`
`279`	`279`	`}`
`280`	`280`
`281`	`281`	`$redis = new $class($hosts, array_diff_key($params, self::$defaultConnectionOptions));`
`282`		`- if ($params['redis_sentinel']) {`
	`282`	`+ if (isset($params['redis_sentinel'])) {`
`283`	`283`	`$redis->getConnection()->setSentinelTimeout($params['timeout']);`
`284`	`284`	`}`
`285`	`285`	`} elseif (class_exists($class, false)) {`