[Cache] Fix Redis6Proxy

nicolas-grekas · nicolas-grekas · commit 65540779e9ce · 2023-09-26T17:48:55.000+02:00
diff --git a/src/Symfony/Component/Cache/Tests/Traits/RedisProxiesTest.php b/src/Symfony/Component/Cache/Tests/Traits/RedisProxiesTest.php
@@ -87,8 +87,6 @@ public function testRelayProxy()
     public function testRedis6Proxy($class, $stub)
     {
         if (version_compare(phpversion('redis'), '6.0.0', '<')) {
-            $this->markTestIncomplete('To be re-enabled when phpredis v6 becomes stable');
-
             $stub = file_get_contents("https://raw.githubusercontent.com/phpredis/phpredis/develop/{$stub}.stub.php");
             $stub = preg_replace('/^class /m', 'return; \0', $stub);
             $stub = preg_replace('/^return; class ([a-zA-Z]++)/m', 'interface \1StubInterface', $stub, 1);
@@ -108,7 +106,7 @@ public function testRedis6Proxy($class, $stub)
                 continue;
             }
             $return = $method->getReturnType() instanceof \ReflectionNamedType && 'void' === (string) $method->getReturnType() ? '' : 'return ';
-            $methods[] = "\n    ".ProxyHelper::exportSignature($method, false, $args)."\n".<<<EOPHP
+            $methods[] = "\n    ".str_replace('timeout = 0.0', 'timeout = 0', ProxyHelper::exportSignature($method, false, $args))."\n".<<<EOPHP
                 {
                     {$return}(\$this->lazyObjectState->realInstance ??= (\$this->lazyObjectState->initializer)())->{$method->name}({$args});
                 }
diff --git a/src/Symfony/Component/Cache/Traits/Redis6Proxy.php b/src/Symfony/Component/Cache/Traits/Redis6Proxy.php
@@ -181,7 +181,7 @@ public function config($operation, $key_or_settings = null, $value = null): mixe
         return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->config(...\func_get_args());
     }
 
-    public function connect($host, $port = 6379, $timeout = 0.0, $persistent_id = null, $retry_interval = 0, $read_timeout = 0.0, $context = null): bool
+    public function connect($host, $port = 6379, $timeout = 0, $persistent_id = null, $retry_interval = 0, $read_timeout = 0, $context = null): bool
     {
         return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->connect(...\func_get_args());
     }
@@ -686,12 +686,12 @@ public function object($subcommand, $key): \Redis|false|int|string
         return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->object(...\func_get_args());
     }
 
-    public function open($host, $port = 6379, $timeout = 0.0, $persistent_id = null, $retry_interval = 0, $read_timeout = 0.0, $context = null): bool
+    public function open($host, $port = 6379, $timeout = 0, $persistent_id = null, $retry_interval = 0, $read_timeout = 0, $context = null): bool
     {
         return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->open(...\func_get_args());
     }
 
-    public function pconnect($host, $port = 6379, $timeout = 0.0, $persistent_id = null, $retry_interval = 0, $read_timeout = 0.0, $context = null): bool
+    public function pconnect($host, $port = 6379, $timeout = 0, $persistent_id = null, $retry_interval = 0, $read_timeout = 0, $context = null): bool
     {
         return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->pconnect(...\func_get_args());
     }
@@ -736,7 +736,7 @@ public function pipeline(): \Redis|bool
         return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->pipeline(...\func_get_args());
     }
 
-    public function popen($host, $port = 6379, $timeout = 0.0, $persistent_id = null, $retry_interval = 0, $read_timeout = 0.0, $context = null): bool
+    public function popen($host, $port = 6379, $timeout = 0, $persistent_id = null, $retry_interval = 0, $read_timeout = 0, $context = null): bool
     {
         return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->popen(...\func_get_args());
     }
diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/ConnectionTest.php b/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/ConnectionTest.php
@@ -118,7 +118,7 @@ public function testKeepGettingPendingMessages()
         $redis = $this->createMock(\Redis::class);
 
         $redis->expects($this->exactly(3))->method('xreadgroup')
-            ->with('symfony', 'consumer', ['queue' => 0], 1, null)
+            ->with('symfony', 'consumer', ['queue' => 0], 1, 1)
             ->willReturn(['queue' => [['message' => json_encode(['body' => 'Test', 'headers' => []])]]]);
 
         $connection = Connection::fromDsn('redis://localhost/queue', [], $redis);
@@ -212,7 +212,7 @@ public function testGetPendingMessageFirst()
         $redis = $this->createMock(\Redis::class);
 
         $redis->expects($this->exactly(1))->method('xreadgroup')
-            ->with('symfony', 'consumer', ['queue' => '0'], 1, null)
+            ->with('symfony', 'consumer', ['queue' => '0'], 1, 1)
             ->willReturn(['queue' => [['message' => '{"body":"1","headers":[]}']]]);
 
         $connection = Connection::fromDsn('redis://localhost/queue', [], $redis);
@@ -237,11 +237,11 @@ public function testClaimAbandonedMessageWithRaceCondition()
             ->willReturnCallback(function (...$args) {
                 static $series = [
                     // first call for pending messages
-                    [['symfony', 'consumer', ['queue' => '0'], 1, null], []],
+                    [['symfony', 'consumer', ['queue' => '0'], 1, 1], []],
                     // second call because of claimed message (redisid-123)
-                    [['symfony', 'consumer', ['queue' => '0'], 1, null], []],
+                    [['symfony', 'consumer', ['queue' => '0'], 1, 1], []],
                     // third call because of no result (other consumer claimed message redisid-123)
-                    [['symfony', 'consumer', ['queue' => '>'], 1, null], []],
+                    [['symfony', 'consumer', ['queue' => '>'], 1, 1], []],
                 ];
 
                 [$expectedArgs, $return] = array_shift($series);
@@ -273,9 +273,9 @@ public function testClaimAbandonedMessage()
             ->willReturnCallback(function (...$args) {
                 static $series = [
                     // first call for pending messages
-                    [['symfony', 'consumer', ['queue' => '0'], 1, null], []],
+                    [['symfony', 'consumer', ['queue' => '0'], 1, 1], []],
                     // second call because of claimed message (redisid-123)
-                    [['symfony', 'consumer', ['queue' => '0'], 1, null], ['queue' => [['message' => '{"body":"1","headers":[]}']]]],
+                    [['symfony', 'consumer', ['queue' => '0'], 1, 1], ['queue' => [['message' => '{"body":"1","headers":[]}']]]],
                 ];
 
                 [$expectedArgs, $return] = array_shift($series);
diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php
@@ -353,6 +353,7 @@ public function get(): ?array
                 $this->group,
                 $this->consumer,
                 [$this->stream => $messageId],
+                1,
                 1
             );
         } catch (\RedisException|\Relay\Exception $e) {

Original file line number	Diff line number	Diff line change
`@@ -87,8 +87,6 @@ public function testRelayProxy()`
`87`	`87`	`public function testRedis6Proxy($class, $stub)`
`88`	`88`	`{`
`89`	`89`	`if (version_compare(phpversion('redis'), '6.0.0', '<')) {`
`90`		`- $this->markTestIncomplete('To be re-enabled when phpredis v6 becomes stable');`
`91`		`-`
`92`	`90`	`$stub = file_get_contents("https://raw.githubusercontent.com/phpredis/phpredis/develop/{$stub}.stub.php");`
`93`	`91`	`$stub = preg_replace('/^class /m', 'return; \0', $stub);`
`94`	`92`	`$stub = preg_replace('/^return; class ([a-zA-Z]++)/m', 'interface \1StubInterface', $stub, 1);`
`@@ -108,7 +106,7 @@ public function testRedis6Proxy($class, $stub)`
`108`	`106`	`continue;`
`109`	`107`	`}`
`110`	`108`	`$return = $method->getReturnType() instanceof \ReflectionNamedType && 'void' === (string) $method->getReturnType() ? '' : 'return ';`
`111`		`- $methods[] = "\n ".ProxyHelper::exportSignature($method, false, $args)."\n".<<<EOPHP`
	`109`	`+ $methods[] = "\n ".str_replace('timeout = 0.0', 'timeout = 0', ProxyHelper::exportSignature($method, false, $args))."\n".<<<EOPHP`
`112`	`110`	`{`
`113`	`111`	`{$return}(\$this->lazyObjectState->realInstance ??= (\$this->lazyObjectState->initializer)())->{$method->name}({$args});`
`114`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ public function config($operation, $key_or_settings = null, $value = null): mixe`
`181`	`181`	`return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->config(...\func_get_args());`
`182`	`182`	`}`
`183`	`183`
`184`		`- public function connect($host, $port = 6379, $timeout = 0.0, $persistent_id = null, $retry_interval = 0, $read_timeout = 0.0, $context = null): bool`
	`184`	`+ public function connect($host, $port = 6379, $timeout = 0, $persistent_id = null, $retry_interval = 0, $read_timeout = 0, $context = null): bool`
`185`	`185`	`{`
`186`	`186`	`return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->connect(...\func_get_args());`
`187`	`187`	`}`
`@@ -686,12 +686,12 @@ public function object($subcommand, $key): \Redis\|false\|int\|string`
`686`	`686`	`return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->object(...\func_get_args());`
`687`	`687`	`}`
`688`	`688`
`689`		`- public function open($host, $port = 6379, $timeout = 0.0, $persistent_id = null, $retry_interval = 0, $read_timeout = 0.0, $context = null): bool`
	`689`	`+ public function open($host, $port = 6379, $timeout = 0, $persistent_id = null, $retry_interval = 0, $read_timeout = 0, $context = null): bool`
`690`	`690`	`{`
`691`	`691`	`return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->open(...\func_get_args());`
`692`	`692`	`}`
`693`	`693`
`694`		`- public function pconnect($host, $port = 6379, $timeout = 0.0, $persistent_id = null, $retry_interval = 0, $read_timeout = 0.0, $context = null): bool`
	`694`	`+ public function pconnect($host, $port = 6379, $timeout = 0, $persistent_id = null, $retry_interval = 0, $read_timeout = 0, $context = null): bool`
`695`	`695`	`{`
`696`	`696`	`return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->pconnect(...\func_get_args());`
`697`	`697`	`}`
`@@ -736,7 +736,7 @@ public function pipeline(): \Redis\|bool`
`736`	`736`	`return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->pipeline(...\func_get_args());`
`737`	`737`	`}`
`738`	`738`
`739`		`- public function popen($host, $port = 6379, $timeout = 0.0, $persistent_id = null, $retry_interval = 0, $read_timeout = 0.0, $context = null): bool`
	`739`	`+ public function popen($host, $port = 6379, $timeout = 0, $persistent_id = null, $retry_interval = 0, $read_timeout = 0, $context = null): bool`
`740`	`740`	`{`
`741`	`741`	`return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->popen(...\func_get_args());`
`742`	`742`	`}`
Original file line number	Diff line number	Diff line change
`@@ -353,6 +353,7 @@ public function get(): ?array`
`353`	`353`	`$this->group,`
`354`	`354`	`$this->consumer,`
`355`	`355`	`[$this->stream => $messageId],`
	`356`	`+ 1,`
`356`	`357`	`1`
`357`	`358`	`);`
`358`	`359`	`} catch (\RedisException\|\Relay\Exception $e) {`