bug #48711 [Cache] RedisTrait::createConnection does not pass auth value from redis sentinel cluster DSN (evgkord)

nicolas-grekas · nicolas-grekas · commit 4eb8013bd9e5 · 2022-12-22T16:14:44.000+01:00
This PR was merged into the 5.4 branch. Discussion ---------- [Cache] RedisTrait::createConnection does not pass auth value from redis sentinel cluster DSN [Cache] RedisTrait::createConnection does not pass auth value from redis sentinel cluster DSN | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no - bugfix | Deprecations? | no | Tickets | Fix #48712 | License | MIT | Doc PR | none - bugfix  Commits ------- 26ba375 Update RedisTrait.php
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -207,7 +207,7 @@ public static function createConnection(string $dsn, array $options = [])
                         break;
                     }
 
-                    $sentinel = new \RedisSentinel($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout']);
+                    $sentinel = new \RedisSentinel($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout'], ...\defined('Redis::OPT_NULL_MULTIBULK_AS_NULL') ? [$params['auth'] ?? ''] : []);
 
                     if ($address = $sentinel->getMasterAddrByName($params['redis_sentinel'])) {
                         [$host, $port] = $address;
@@ -219,7 +219,10 @@ public static function createConnection(string $dsn, array $options = [])
                 }
 
                 try {
-                    @$redis->{$connect}($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout'], ...\defined('Redis::SCAN_PREFIX') ? [['stream' => $params['ssl'] ?? null]] : []);
+                    @$redis->{$connect}($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout'], ...\defined('Redis::SCAN_PREFIX') ? [[
+                        'auth' => $params['auth'] ?? '',
+                        'stream' => $params['ssl'] ?? null,
+                    ]] : []);
 
                     set_error_handler(function ($type, $msg) use (&$error) { $error = $msg; });
                     try {
