Merge branch '6.4' into 7.1

chalasr · chalasr · commit 8fb59cc5e3bc · 2024-09-24T19:01:15.000+02:00
* 6.4:
  silence warnings issued by Redis Sentinel on connection issues
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -252,10 +252,10 @@ public static function createConnection(#[\SensitiveParameter] string $dsn, arra
                         } 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 $sentinelClass($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout'], ...$extra);
                         }
 
-                        if ($address = $sentinel->getMasterAddrByName($params['redis_sentinel'])) {
+                        if ($address = @$sentinel->getMasterAddrByName($params['redis_sentinel'])) {
                             [$host, $port] = $address;
                         }
                     } catch (\RedisException|\Relay\Exception $redisException) {
diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php
@@ -142,10 +142,10 @@ public function __construct(array $options, \Redis|Relay|\RedisCluster|null $red
 
                                 $sentinel = new \RedisSentinel($params);
                             } else {
-                                $sentinel = new $sentinelClass($host, $port, $options['timeout'], $options['persistent_id'], $options['retry_interval'], $options['read_timeout']);
+                                $sentinel = @new $sentinelClass($host, $port, $options['timeout'], $options['persistent_id'], $options['retry_interval'], $options['read_timeout']);
                             }
 
-                            if ($address = $sentinel->getMasterAddrByName($sentinelMaster)) {
+                            if ($address = @$sentinel->getMasterAddrByName($sentinelMaster)) {
                                 [$host, $port] = $address;
                             }
                         } catch (\RedisException|\Relay\Exception $redisException) {

Original file line number	Diff line number	Diff line change
`@@ -252,10 +252,10 @@ public static function createConnection(#[\SensitiveParameter] string $dsn, arra`
`252`	`252`	`} else {`
`253`	`253`	`$extra = $passAuth ? [$params['auth']] : [];`
`254`	`254`
`255`		`- $sentinel = new $sentinelClass($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout'], ...$extra);`
	`255`	`+ $sentinel = @new $sentinelClass($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout'], ...$extra);`
`256`	`256`	`}`
`257`	`257`
`258`		`- if ($address = $sentinel->getMasterAddrByName($params['redis_sentinel'])) {`
	`258`	`+ if ($address = @$sentinel->getMasterAddrByName($params['redis_sentinel'])) {`
`259`	`259`	`[$host, $port] = $address;`
`260`	`260`	`}`
`261`	`261`	`} catch (\RedisException\|\Relay\Exception $redisException) {`
Original file line number	Diff line number	Diff line change
`@@ -142,10 +142,10 @@ public function __construct(array $options, \Redis\|Relay\|\RedisCluster\|null $red`
`142`	`142`
`143`	`143`	`$sentinel = new \RedisSentinel($params);`
`144`	`144`	`} else {`
`145`		`- $sentinel = new $sentinelClass($host, $port, $options['timeout'], $options['persistent_id'], $options['retry_interval'], $options['read_timeout']);`
	`145`	`+ $sentinel = @new $sentinelClass($host, $port, $options['timeout'], $options['persistent_id'], $options['retry_interval'], $options['read_timeout']);`
`146`	`146`	`}`
`147`	`147`
`148`		`- if ($address = $sentinel->getMasterAddrByName($sentinelMaster)) {`
	`148`	`+ if ($address = @$sentinel->getMasterAddrByName($sentinelMaster)) {`
`149`	`149`	`[$host, $port] = $address;`
`150`	`150`	`}`
`151`	`151`	`} catch (\RedisException\|\Relay\Exception $redisException) {`