bug #51775 [Cache] Fix two initializations of Redis Sentinel (digilist)

nicolas-grekas · nicolas-grekas · commit 1b0aed0ecc95 · 2023-09-28T16:48:07.000+02:00
This PR was merged into the 6.4 branch. Discussion ---------- [Cache] Fix two initializations of Redis Sentinel | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | n/a | License | MIT After #51687 and #51683 have been merged, there are now two initializations of Redis Sentinel, which also leads to the integration test failure mentioned in [this comment](#51687 (comment)). This PR fixes this. Commits ------- 2d23a1b [Cache] Fix two initializations of Redis Sentinel
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -223,29 +223,28 @@ public static function createConnection(#[\SensitiveParameter] string $dsn, arra
                         break;
                     }
 
-                    if (version_compare(phpversion('redis'), '6.0.0', '>=') && $isRedisExt) {
-                        $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'];
+                    try {
+                        if (version_compare(phpversion('redis'), '6.0.0', '>=') && $isRedisExt) {
+                            $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 $sentinelClass($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout'], ...$extra);
                         }
 
-                        $sentinel = new \RedisSentinel($options);
-                    } else {
-                        $extra = $passAuth ? [$params['auth']] : [];
-
-                        $sentinel = new $sentinelClass($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout'], ...$extra);
-                    }
-
-                    try {
-                        $sentinel = new $sentinelClass($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout'], ...$extra);
                         if ($address = $sentinel->getMasterAddrByName($params['redis_sentinel'])) {
                             [$host, $port] = $address;
                         }
