[Cache] Add \Relay\Cluster support

Author: dorrogeray

Store/RedisStore.php

@@ -14,6 +14,7 @@
 use Predis\Response\Error;
 use Predis\Response\ServerException;
 use Relay\Relay;
+use Relay\Cluster as RelayCluster;
 use Symfony\Component\Lock\Exception\InvalidTtlException;
 use Symfony\Component\Lock\Exception\LockConflictedException;
 use Symfony\Component\Lock\Exception\LockStorageException;
@@ -38,7 +39,7 @@ class RedisStore implements SharedLockStoreInterface
      * @param float $initialTtl The expiration delay of locks in seconds
      */
     public function __construct(
-        private \Redis|Relay|\RedisArray|\RedisCluster|\Predis\ClientInterface $redis,
+        private \Redis|Relay|RelayCluster|\RedisArray|\RedisCluster|\Predis\ClientInterface $redis,
         private float $initialTtl = 300.0,
     ) {
         if ($initialTtl <= 0) {
@@ -231,14 +232,14 @@ private function evaluate(string $script, string $resource, array $args): mixed
     {
         $scriptSha = sha1($script);
 
-        if ($this->redis instanceof \Redis || $this->redis instanceof Relay || $this->redis instanceof \RedisCluster) {
+        if ($this->redis instanceof \Redis || $this->redis instanceof Relay || $this->redis instanceof RelayCluster || $this->redis instanceof \RedisCluster) {
             $this->redis->clearLastError();
 
             $result = $this->redis->evalSha($scriptSha, array_merge([$resource], $args), 1);
             if (null !== ($err = $this->redis->getLastError()) && str_starts_with($err, self::NO_SCRIPT_ERROR_MESSAGE_PREFIX)) {
                 $this->redis->clearLastError();
 
-                if ($this->redis instanceof \RedisCluster) {
+                if ($this->redis instanceof \RedisCluster || $this->redis instanceof RelayCluster) {
                     foreach ($this->redis->_masters() as $master) {
                         $this->redis->script($master, 'LOAD', $script);
                     }

Tests/Store/AbstractRedisStoreTestCase.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\Lock\Tests\Store;
 
 use Relay\Relay;
+use Relay\Cluster as RelayCluster;
 use Symfony\Component\Lock\Exception\InvalidArgumentException;
 use Symfony\Component\Lock\Exception\LockConflictedException;
 use Symfony\Component\Lock\Key;
@@ -30,7 +31,7 @@ protected function getClockDelay(): int
         return 250000;
     }
 
-    abstract protected function getRedisConnection(): \Redis|Relay|\RedisArray|\RedisCluster|\Predis\ClientInterface;
+    abstract protected function getRedisConnection(): \Redis|Relay|RelayCluster|\RedisArray|\RedisCluster|\Predis\ClientInterface;
 
     public function getStore(): PersistingStoreInterface
     {
@@ -55,7 +56,7 @@ public function testBackwardCompatibility()
 
 class Symfony51Store
 {
-    private \Redis|Relay|\RedisCluster|\RedisArray|\Predis\ClientInterface $redis;
+    private \Redis|Relay|RelayCluster|\RedisCluster|\RedisArray|\Predis\ClientInterface $redis;
 
     public function __construct($redis)
     {
@@ -85,7 +86,7 @@ public function exists(Key $key)
 
     private function evaluate(string $script, string $resource, array $args)
     {
-        if ($this->redis instanceof \Redis || $this->redis instanceof Relay || $this->redis instanceof \RedisCluster) {
+        if ($this->redis instanceof \Redis || $this->redis instanceof Relay || $this->redis instanceof RelayCluster || $this->redis instanceof \RedisCluster) {
             return $this->redis->eval($script, array_merge([$resource], $args), 1);
         }
 

Tests/Store/RelayClusterStoreTest.php

@@ -0,0 +1,48 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Store;
+
+use Relay\Cluster as RelayCluster;
+use Symfony\Component\Lock\Tests\Store\AbstractRedisStoreTestCase;
+
+/**
+ * @requires extension relay
+ *
+ * @group integration
+ */
+class RelayClusterStoreTest extends AbstractRedisStoreTestCase
+{
+    protected function setUp(): void
+    {
+        $relayCluster = $this->getRedisConnection();
+
+        foreach ($relayCluster->_masters() as $hostAndPort) {
+            $relayCluster->flushdb($hostAndPort);
+        }
+    }
+
+    public static function setUpBeforeClass(): void
+    {
+        if (!class_exists(RelayCluster::class)) {
+            self::markTestSkipped('The Relay\Cluster class is required.');
+        }
+
+        if (getenv('REDIS_CLUSTER_HOSTS') === false) {
+            self::markTestSkipped('REDIS_CLUSTER_HOSTS env var is not defined.');
+        }
+    }
+
+    protected function getRedisConnection(): RelayCluster
+    {
+        return new RelayCluster('', explode(' ', getenv('REDIS_CLUSTER_HOSTS')));
+    }
+}