symfony
diff --git a/‎src/Symfony/Component/Cache/Tests/Adapter/RelayClusterAdapterTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Tests/Adapter/RelayClusterAdapterTest.php
+4-4 b/‎src/Symfony/Component/Cache/Tests/Adapter/RelayClusterAdapterTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Tests/Adapter/RelayClusterAdapterTest.php
+4-4
diff --git a/‎src/Symfony/Component/Cache/Traits/RedisTrait.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Traits/RedisTrait.php
+11-19 b/‎src/Symfony/Component/Cache/Traits/RedisTrait.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Traits/RedisTrait.php
+11-19
@@ -35,7 +35,7 @@ public static function setUpBeforeClass(): void
             self::markTestSkipped('REDIS_CLUSTER_HOSTS env var is not defined.');
         }
 
-        self::$redis = AbstractAdapter::createConnection('redis:?host['.str_replace(' ', ']&host[', $hosts).']', ['lazy' => true, 'relay_cluster' => true]);
+        self::$redis = AbstractAdapter::createConnection('redis:?host['.str_replace(' ', ']&host[', $hosts).']', ['lazy' => true, 'redis_cluster' => true, 'class' => RelayCluster::class]);
         self::$redis->setOption(Relay::OPT_PREFIX, 'prefix_');
     }
 
@@ -60,9 +60,9 @@ public function testFailedCreateConnection(string $dsn)
     public static function provideFailedCreateConnection(): array
     {
         return [
-            ['redis://localhost:1234?relay_cluster=1'],
-            ['redis://foo@localhost?relay_cluster=1'],
-            ['redis://localhost/123?relay_cluster=1'],
+            ['redis://localhost:1234?redis_cluster=1&class=Relay\Cluster'],
+            ['redis://foo@localhost?redis_cluster=1&class=Relay\Cluster'],
+            ['redis://localhost/123?redis_cluster=1&class=Relay\Cluster'],
         ];
     }
 }
@@ -47,7 +47,6 @@ trait RedisTrait
         'tcp_keepalive' => 0,
         'lazy' => null,
         'redis_cluster' => false,
-        'relay_cluster' => false,
         'relay_cluster_context' => [],
         'redis_sentinel' => null,
         'dbindex' => 0,
@@ -191,33 +190,26 @@ public static function createConnection(#[\SensitiveParameter] string $dsn, arra
         if (isset($params['lazy'])) {
             $params['lazy'] = filter_var($params['lazy'], \FILTER_VALIDATE_BOOLEAN);
         }
+
         $params['redis_cluster'] = filter_var($params['redis_cluster'], \FILTER_VALIDATE_BOOLEAN);
-        $params['relay_cluster'] = filter_var($params['relay_cluster'], \FILTER_VALIDATE_BOOLEAN);
-
-        $conflictingOptions = array_filter([
-            'redis_cluster'  => $params['redis_cluster'],
-            'relay_cluster'  => $params['relay_cluster'],
-            'redis_sentinel' => $params['redis_sentinel'],
-        ], fn ($value) => $value === true);
-
-        if (count($conflictingOptions) > 1) {
-            $keys = implode('", "', array_keys($conflictingOptions));
-            throw new InvalidArgumentException(sprintf(
-                'Cannot use %s at the same time. Please configure only one of "redis_cluster", "relay_cluster", or "redis_sentinel".',
-                $keys
-            ));
+        if ($params['redis_cluster'] && isset($params['redis_sentinel'])) {
+            throw new InvalidArgumentException('Cannot use both "redis_cluster" and "redis_sentinel" at the same time.');
         }
 
         $class = $params['class'] ?? match (true) {
-            $params['redis_cluster'] => \extension_loaded('redis') ? \RedisCluster::class : \Predis\Client::class,
+            $params['redis_cluster'] => match (true) {
+                \extension_loaded('redis') => \RedisCluster::class,
+                \extension_loaded('relay') => RelayCluster::class,
+                default => \Predis\Client::class,
+            },
             isset($params['redis_sentinel']) => match (true) {
                 \extension_loaded('redis') => \Redis::class,
                 \extension_loaded('relay') => Relay::class,
                 default => \Predis\Client::class,
             },
-            $params['relay_cluster'] === false && 1 < \count($hosts) && \extension_loaded('redis') => \RedisArray::class,
-            $params['relay_cluster'] === false && \extension_loaded('redis') => \Redis::class,
-            \extension_loaded('relay') => $params['relay_cluster'] === true ? RelayCluster::class : Relay::class,
+            1 < \count($hosts) && \extension_loaded('redis') => \RedisArray::class,
+            \extension_loaded('redis') => \Redis::class,
+            \extension_loaded('relay') => Relay::class,
             default => \Predis\Client::class,
         };
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public static function setUpBeforeClass(): void`
`35`	`35`	`self::markTestSkipped('REDIS_CLUSTER_HOSTS env var is not defined.');`
`36`	`36`	`}`
`37`	`37`
`38`		`- self::$redis = AbstractAdapter::createConnection('redis:?host['.str_replace(' ', ']&host[', $hosts).']', ['lazy' => true, 'relay_cluster' => true]);`
	`38`	`+ self::$redis = AbstractAdapter::createConnection('redis:?host['.str_replace(' ', ']&host[', $hosts).']', ['lazy' => true, 'redis_cluster' => true, 'class' => RelayCluster::class]);`
`39`	`39`	`self::$redis->setOption(Relay::OPT_PREFIX, 'prefix_');`
`40`	`40`	`}`
`41`	`41`
`@@ -60,9 +60,9 @@ public function testFailedCreateConnection(string $dsn)`
`60`	`60`	`public static function provideFailedCreateConnection(): array`
`61`	`61`	`{`
`62`	`62`	`return [`
`63`		`- ['redis://localhost:1234?relay_cluster=1'],`
`64`		`- ['redis://foo@localhost?relay_cluster=1'],`
`65`		`- ['redis://localhost/123?relay_cluster=1'],`
	`63`	`+ ['redis://localhost:1234?redis_cluster=1&class=Relay\Cluster'],`
	`64`	`+ ['redis://foo@localhost?redis_cluster=1&class=Relay\Cluster'],`
	`65`	`+ ['redis://localhost/123?redis_cluster=1&class=Relay\Cluster'],`
`66`	`66`	`];`
`67`	`67`	`}`
`68`	`68`	`}`