Merge branch '5.3' into 5.4

nicolas-grekas · nicolas-grekas · commit 355dd00ce5ae · 2021-09-25T10:58:27.000+02:00
* 5.3:
  [Messenger] relax parameter type in cluster mode
diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php
@@ -130,7 +130,10 @@ private static function initializeRedis(\Redis $redis, string $host, int $port,
         return $redis;
     }
 
-    private static function initializeRedisCluster(?\RedisCluster $redis, array $hosts, ?string $auth, int $serializer): \RedisCluster
+    /**
+     * @param string|string[]|null $auth
+     */
+    private static function initializeRedisCluster(?\RedisCluster $redis, array $hosts, $auth, int $serializer): \RedisCluster
     {
         if (null === $redis) {
             $redis = new \RedisCluster(null, $hosts, 0.0, 0.0, false, $auth);

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,10 @@ private static function initializeRedis(\Redis $redis, string $host, int $port,`
`130`	`130`	`return $redis;`
`131`	`131`	`}`
`132`	`132`
`133`		`- private static function initializeRedisCluster(?\RedisCluster $redis, array $hosts, ?string $auth, int $serializer): \RedisCluster`
	`133`	`+ /**`
	`134`	`+ * @param string\|string[]\|null $auth`
	`135`	`+ */`
	`136`	`+ private static function initializeRedisCluster(?\RedisCluster $redis, array $hosts, $auth, int $serializer): \RedisCluster`
`134`	`137`	`{`
`135`	`138`	`if (null === $redis) {`
`136`	`139`	`$redis = new \RedisCluster(null, $hosts, 0.0, 0.0, false, $auth);`