diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
index 0e7740e628369..287c0ea962121 100644
--- a/src/Symfony/Component/Cache/Traits/RedisTrait.php
+++ b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -202,6 +202,7 @@ public static function createConnection(string $dsn, array $options = [])
do {
$host = $hosts[$hostIndex]['host'] ?? $hosts[$hostIndex]['path'];
$port = $hosts[$hostIndex]['port'] ?? 0;
+ $passAuth = \defined('Redis::OPT_NULL_MULTIBULK_AS_NULL') && isset($params['auth']);
$address = false;
if (isset($hosts[$hostIndex]['host']) && $tls) {
@@ -211,11 +212,27 @@ public static function createConnection(string $dsn, array $options = [])
if (!isset($params['redis_sentinel'])) {
break;
}
- $extra = [];
- if (\defined('Redis::OPT_NULL_MULTIBULK_AS_NULL') && isset($params['auth'])) {
- $extra = [$params['auth']];
+
+ if (version_compare(phpversion('redis'), '6.0.0', '>=')) {
+ $options = [
+ 'host' => $host,
+ 'port' => $port,
+ 'connectTimeout' => $params['timeout'],
+ 'persistent' => $params['persistent_id'],
+ 'retryInterval' => $params['retry_interval'],
+ 'readTimeout' => $params['read_timeout'],
+ ];
+
+ if ($passAuth) {
+ $options['auth'] = $params['auth'];
+ }
+
+ $sentinel = new \RedisSentinel($options);
+ } else {
+ $extra = $passAuth ? [$params['auth']] : [];
+
+ $sentinel = new \RedisSentinel($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout'], ...$extra);
}
- $sentinel = new \RedisSentinel($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout'], ...$extra);
try {
if ($address = $sentinel->getMasterAddrByName($params['redis_sentinel'])) {
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy