bug #52629 [Messenger] Fix support for Redis Sentinel using php-redis 6.0.0 (pepeh)

nicolas-grekas · nicolas-grekas · commit 43a1fa15bba9 · 2023-11-21T14:08:13.000+01:00
This PR was squashed before being merged into the 6.3 branch. Discussion ---------- [Messenger] Fix support for Redis Sentinel using php-redis 6.0.0 | Q | A | ------------- | --- | Branch? | 6.3 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #52487 | License | MIT Added support for [php-redis 6.0.0](https://github.com/phpredis/phpredis/blob/develop/CHANGELOG.md#600---2023-09-09-github-pecl) to Symfony/Component/Messenger/Bridge/Redis/Transport/Connection. A similar fix was done for RedisTrait before: #51683 Commits ------- 42a80db [Messenger] Fix support for Redis Sentinel using php-redis 6.0.0
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 (\extension_loaded('redis') && 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));
