bug #54816 [Cache] Fix support for predis/predis:^2.0 (mfettig)

nicolas-grekas · nicolas-grekas · commit fd8cee6a44c8 · 2024-05-02T14:33:22.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [Cache] Fix support for predis/predis:^2.0 | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | - | License | MIT This PR backports #49801 to 5.4. That's the best way to fix the remaining deprecations. Commits ------- 5ab2d90 [Cache] Fix support for predis/predis:^2.0
diff --git a/composer.json b/composer.json
@@ -138,7 +138,7 @@
         "php-http/httplug": "^1.0|^2.0",
         "php-http/message-factory": "^1.0",
         "phpstan/phpdoc-parser": "^1.0",
-        "predis/predis": "~1.1",
+        "predis/predis": "^1.1|^2.0",
         "psr/http-client": "^1.0",
         "psr/simple-cache": "^1.0|^2.0",
         "egulias/email-validator": "^2.1.10|^3.1|^4",
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -15,6 +15,8 @@
 use Predis\Connection\Aggregate\ClusterInterface;
 use Predis\Connection\Aggregate\RedisCluster;
 use Predis\Connection\Aggregate\ReplicationInterface;
+use Predis\Connection\Cluster\ClusterInterface as Predis2ClusterInterface;
+use Predis\Connection\Cluster\RedisCluster as Predis2RedisCluster;
 use Predis\Response\ErrorInterface;
 use Predis\Response\Status;
 use Symfony\Component\Cache\Exception\CacheException;
@@ -414,7 +416,7 @@ protected function doFetch(array $ids)
 
         $result = [];
 
-        if ($this->redis instanceof \Predis\ClientInterface && $this->redis->getConnection() instanceof ClusterInterface) {
+        if ($this->redis instanceof \Predis\ClientInterface && ($this->redis->getConnection() instanceof ClusterInterface || $this->redis->getConnection() instanceof Predis2ClusterInterface)) {
             $values = $this->pipeline(function () use ($ids) {
                 foreach ($ids as $id) {
                     yield 'get' => [$id];
@@ -511,7 +513,7 @@ protected function doDelete(array $ids)
             return true;
         }
 
-        if ($this->redis instanceof \Predis\ClientInterface && $this->redis->getConnection() instanceof ClusterInterface) {
+        if ($this->redis instanceof \Predis\ClientInterface && ($this->redis->getConnection() instanceof ClusterInterface || $this->redis->getConnection() instanceof Predis2ClusterInterface)) {
             static $del;
             $del = $del ?? (class_exists(UNLINK::class) ? 'unlink' : 'del');
 
@@ -569,7 +571,7 @@ private function pipeline(\Closure $generator, ?object $redis = null): \Generato
         $ids = [];
         $redis = $redis ?? $this->redis;
 
-        if ($redis instanceof RedisClusterProxy || $redis instanceof \RedisCluster || ($redis instanceof \Predis\ClientInterface && $redis->getConnection() instanceof RedisCluster)) {
+        if ($redis instanceof RedisClusterProxy || $redis instanceof \RedisCluster || ($redis instanceof \Predis\ClientInterface && ($redis->getConnection() instanceof RedisCluster || $redis->getConnection() instanceof Predis2RedisCluster))) {
             // phpredis & predis don't support pipelining with RedisCluster
             // see https://github.com/phpredis/phpredis/blob/develop/cluster.markdown#pipelining
             // see https://github.com/nrk/predis/issues/267#issuecomment-123781423
@@ -631,7 +633,7 @@ private function getHosts(): array
         $hosts = [$this->redis];
         if ($this->redis instanceof \Predis\ClientInterface) {
             $connection = $this->redis->getConnection();
-            if ($connection instanceof ClusterInterface && $connection instanceof \Traversable) {
+            if (($connection instanceof ClusterInterface || $connection instanceof Predis2ClusterInterface) && $connection instanceof \Traversable) {
                 $hosts = [];
                 foreach ($connection as $c) {
                     $hosts[] = new \Predis\Client($c);
diff --git a/src/Symfony/Component/Cache/composer.json b/src/Symfony/Component/Cache/composer.json
@@ -35,7 +35,7 @@
         "cache/integration-tests": "dev-master",
         "doctrine/cache": "^1.6|^2.0",
         "doctrine/dbal": "^2.13.1|^3|^4",
-        "predis/predis": "^1.1",
+        "predis/predis": "^1.1|^2.0",
         "psr/simple-cache": "^1.0|^2.0",
         "symfony/config": "^4.4|^5.0|^6.0",
         "symfony/dependency-injection": "^4.4|^5.0|^6.0",
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PredisClusterSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PredisClusterSessionHandlerTest.php
@@ -23,6 +23,9 @@ class PredisClusterSessionHandlerTest extends AbstractRedisSessionHandlerTestCas
      */
     protected function createRedisClient(string $host): object
     {
-        return new Client([array_combine(['host', 'port'], explode(':', getenv('REDIS_HOST')) + [1 => 6379])]);
+        return new Client(
+            [array_combine(['host', 'port'], explode(':', getenv('REDIS_HOST')) + [1 => 6379])],
+            ['cluster' => 'redis']
+        );
     }
 }
diff --git a/src/Symfony/Component/HttpFoundation/composer.json b/src/Symfony/Component/HttpFoundation/composer.json
@@ -22,7 +22,7 @@
         "symfony/polyfill-php80": "^1.16"
     },
     "require-dev": {
-        "predis/predis": "~1.0",
+        "predis/predis": "^1.0|^2.0",
         "symfony/cache": "^4.4|^5.0|^6.0",
         "symfony/dependency-injection": "^5.4|^6.0",
         "symfony/http-kernel": "^5.4.12|^6.0.12|^6.1.4",
diff --git a/src/Symfony/Component/Lock/composer.json b/src/Symfony/Component/Lock/composer.json
@@ -23,7 +23,7 @@
     },
     "require-dev": {
         "doctrine/dbal": "^2.13|^3|^4",
-        "predis/predis": "~1.0"
+        "predis/predis": "^1.0|^2.0"
     },
     "conflict": {
         "doctrine/dbal": "<2.13"
diff --git a/src/Symfony/Component/Semaphore/composer.json b/src/Symfony/Component/Semaphore/composer.json
@@ -24,7 +24,7 @@
         "psr/log": "^1|^2|^3"
     },
     "require-dev": {
-        "predis/predis": "~1.0"
+        "predis/predis": "^1.1|^2.0"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Semaphore\\": "" },

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,9 @@ class PredisClusterSessionHandlerTest extends AbstractRedisSessionHandlerTestCas`
`23`	`23`	`*/`
`24`	`24`	`protected function createRedisClient(string $host): object`
`25`	`25`	`{`
`26`		`- return new Client([array_combine(['host', 'port'], explode(':', getenv('REDIS_HOST')) + [1 => 6379])]);`
	`26`	`+ return new Client(`
	`27`	`+ [array_combine(['host', 'port'], explode(':', getenv('REDIS_HOST')) + [1 => 6379])],`
	`28`	`+ ['cluster' => 'redis']`
	`29`	`+ );`
`27`	`30`	`}`
`28`	`31`	`}`