feature #61955 [Messenger] bump ext-redis to 6.2 and ext-relay to 0.12 minimum (xabbuh)

fabpot · fabpot · commit 577926320c20 · 2025-10-06T07:43:19.000+02:00
This PR was merged into the 7.4 branch. Discussion ---------- [Messenger] bump ext-redis to 6.2 and ext-relay to 0.12 minimum | Q | A | ------------- | --- | Branch? | 7.4 | Bug fix? | no | New feature? | yes | Deprecations? | no | Issues | | License | MIT Commits ------- 846422a bump ext-redis to 6.2 and ext-relay to 0.12 minimum
diff --git a/src/Symfony/Component/Cache/Traits/Relay/WaitaofTrait.php b/src/Symfony/Component/Cache/Traits/Relay/WaitaofTrait.php
diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/CHANGELOG.md b/src/Symfony/Component/Messenger/Bridge/Redis/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+7.4
+---
+
+ * Bump ext-redis to 6.2 and ext-relay to 0.12 minimum
+
 7.3
 ---
 
diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php
@@ -71,10 +71,6 @@ class Connection
 
     public function __construct(array $options, \Redis|Relay|\RedisCluster|null $redis = null)
     {
-        if (version_compare(phpversion('redis'), '4.3.0', '<')) {
-            throw new LogicException('The redis transport requires php-redis 4.3.0 or higher.');
-        }
-
         $options += self::DEFAULT_OPTIONS;
         $host = $options['host'];
         $port = $options['port'];
@@ -116,7 +112,7 @@ public function __construct(array $options, \Redis|Relay|\RedisCluster|null $red
                         }
 
                         try {
-                            if (\extension_loaded('redis') && version_compare(phpversion('redis'), '6.0.0-dev', '>=')) {
+                            if (\extension_loaded('redis')) {
                                 $params = [
                                     'host' => $host,
                                     'port' => $port,
@@ -701,7 +697,6 @@ public function getMessageCount(): int
         }
 
         // Iterate through the stream. See https://redis.io/commands/xrange/#iterating-a-stream.
-        $useExclusiveRangeInterval = version_compare(phpversion('redis'), '6.2.0', '>=');
         $total = 0;
         while (true) {
             if (!$range = $redis->xRange($this->stream, $lastDeliveredId, '+', 100)) {
@@ -710,11 +705,7 @@ public function getMessageCount(): int
 
             $total += \count($range);
 
-            if ($useExclusiveRangeInterval) {
-                $lastDeliveredId = preg_replace_callback('#\d+$#', static fn (array $matches) => (int) $matches[0] + 1, array_key_last($range));
-            } else {
-                $lastDeliveredId = '('.array_key_last($range);
-            }
+            $lastDeliveredId = preg_replace_callback('#\d+$#', static fn (array $matches) => (int) $matches[0] + 1, array_key_last($range));
         }
     }
 
diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/composer.json b/src/Symfony/Component/Messenger/Bridge/Redis/composer.json
@@ -25,6 +25,10 @@
         "symfony/serializer": "^6.4|^7.0|^8.0",
         "symfony/var-dumper": "^6.4|^7.0|^8.0"
     },
+    "conflict": {
+        "ext-redis": "<6.2",
+        "ext-relay": "<0.12"
+    },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Messenger\\Bridge\\Redis\\": "" },
         "exclude-from-classmap": [
