[Messenger] Fix support for Redis Sentinel using php-redis 6.0.0

pepeh · pepeh · commit 77db60c51c7f · 2023-11-17T15:49:58.000+02:00
diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php
@@ -94,7 +94,21 @@ public function __construct(array $options, \Redis|Relay|\RedisCluster $redis =
         } else {
             if (null !== $sentinelMaster) {
                 $sentinelClass = \extension_loaded('redis') ? \RedisSentinel::class : Sentinel::class;
-                $sentinelClient = new $sentinelClass($host, $port, $options['timeout'], $options['persistent_id'], $options['retry_interval'], $options['read_timeout']);
+
+                if (version_compare(phpversion('redis'), '6.0.0', '>=')) {
+                    $params = [
+                        'host' => $host,
+                        'port' => $port,
+                        'connectTimeout' => $options['timeout'],
+                        'persistent' => $options['persistent_id'],
+                        'retryInterval' => $options['retry_interval'],
+                        'readTimeout' => $options['read_timeout'],
+                    ];
+
+                    $sentinelClient = new \RedisSentinel($params);
+                } else {
+                    $sentinelClient = new $sentinelClass($host, $port, $options['timeout'], $options['persistent_id'], $options['retry_interval'], $options['read_timeout']);
+                }
 
                 if (!$address = $sentinelClient->getMasterAddrByName($sentinelMaster)) {
                     throw new InvalidArgumentException(sprintf('Failed to retrieve master information from master name "%s" and address "%s:%d".', $sentinelMaster, $host, $port));
