Update RedisTrait.php

evgkord · web-flow · commit 61b3b46b3d36 · 2022-12-20T12:58:40.000+03:00
[Cache] RedisTrait::createConnection does not pass auth value from redis sentinel cluster DSN
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'], $params['auth'] ?? null);
 
                     if ($address = $sentinel->getMasterAddrByName($params['redis_sentinel'])) {
                         [$host, $port] = $address;
@@ -219,7 +219,18 @@ 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'],
+                        array_merge(
+                            isset($params['auth']) ? ['auth' => $params['auth']] : [],
+                            \defined('Redis::SCAN_PREFIX') ? ['stream' => $params['ssl'] ?? null] : []
+                        )
+                    );
 
                     set_error_handler(function ($type, $msg) use (&$error) { $error = $msg; });
                     try {
