sync the Redis6Proxy class with latest upstream changes

xabbuh · xabbuh · commit 5fe293442f37 · 2022-10-02T11:17:17.000+02:00
see phpredis/phpredis#2162, phpredis/phpredis#2163, and phpredis/phpredis#2166
diff --git a/src/Symfony/Component/Cache/Tests/Traits/RedisProxiesTest.php b/src/Symfony/Component/Cache/Tests/Traits/RedisProxiesTest.php
@@ -26,7 +26,7 @@ class RedisProxiesTest extends TestCase
      */
     public function testRedis5Proxy($class)
     {
-        $proxy = file_get_contents(\dirname(__DIR__)."/Traits/{$class}5Proxy.php");
+        $proxy = file_get_contents(\dirname(__DIR__, 2)."/Traits/{$class}5Proxy.php");
         $proxy = substr($proxy, 0, 8 + strpos($proxy, "\n    ];"));
         $methods = [];
 
diff --git a/src/Symfony/Component/Cache/Traits/Redis6Proxy.php b/src/Symfony/Component/Cache/Traits/Redis6Proxy.php
@@ -162,7 +162,7 @@ public function command($opt, $arg): mixed
         return $this->lazyObjectReal->command(...\func_get_args());
     }
 
-    public function config($operation, $key, $value = null): mixed
+    public function config($operation, $key = null, $value = null): mixed
     {
         return $this->lazyObjectReal->config(...\func_get_args());
     }
@@ -257,6 +257,17 @@ public function failover($to = null, $abort = false, $timeout = 0): bool
         return $this->lazyObjectReal->failover(...\func_get_args());
     }
 
+    public function expiretime($key): \Redis|false|int
+    {
+        return $this->lazyObjectReal->expiretime(...\func_get_args());
+    }
+
+    public function pexpiretime($key): \Redis|false|int
+    {
+        return $this->lazyObjectReal->pexpiretime(...\func_get_args());
+    }
+
+
     public function flushAll($sync = null): bool
     {
         return $this->lazyObjectReal->flushAll(...\func_get_args());
@@ -382,6 +393,11 @@ public function getRange($key, $start, $end)
         return $this->lazyObjectReal->getRange(...\func_get_args());
     }
 
+    public function lcs($key1, $key2, $options = null): \Redis|array|false|int|string
+    {
+        return $this->lazyObjectReal->lcs(...\func_get_args());
+    }
+
     public function getReadTimeout(): int
     {
         return $this->lazyObjectReal->getReadTimeout(...\func_get_args());
@@ -767,6 +783,11 @@ public function sInter($key, ...$other_keys): array
         return $this->lazyObjectReal->sInter(...\func_get_args());
     }
 
+    public function sintercard($keys, $limit = -1): \Redis|false|int
+    {
+        return $this->lazyObjectReal->sintercard(...\func_get_args());
+    }
+
     public function sInterStore($dst, $key, ...$other_keys): int
     {
         return $this->lazyObjectReal->sInterStore(...\func_get_args());
@@ -1162,6 +1183,11 @@ public function zinter($keys, $weights = null, $options = null): array
         return $this->lazyObjectReal->zinter(...\func_get_args());
     }
 
+    public function zintercard(array $keys, int $limit = -1): \Redis|false|int
+    {
+        return $this->lazyObjectReal->zintercard(...\func_get_args());
+    }
+
     public function zinterstore($dst, $keys, $weights = null, $aggregate = null): int
     {
         return $this->lazyObjectReal->zinterstore(...\func_get_args());

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class RedisProxiesTest extends TestCase`
`26`	`26`	`*/`
`27`	`27`	`public function testRedis5Proxy($class)`
`28`	`28`	`{`
`29`		`- $proxy = file_get_contents(\dirname(__DIR__)."/Traits/{$class}5Proxy.php");`
	`29`	`+ $proxy = file_get_contents(\dirname(__DIR__, 2)."/Traits/{$class}5Proxy.php");`
`30`	`30`	`$proxy = substr($proxy, 0, 8 + strpos($proxy, "\n ];"));`
`31`	`31`	`$methods = [];`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ public function command($opt, $arg): mixed`
`162`	`162`	`return $this->lazyObjectReal->command(...\func_get_args());`
`163`	`163`	`}`
`164`	`164`
`165`		`- public function config($operation, $key, $value = null): mixed`
	`165`	`+ public function config($operation, $key = null, $value = null): mixed`
`166`	`166`	`{`
`167`	`167`	`return $this->lazyObjectReal->config(...\func_get_args());`
`168`	`168`	`}`
`@@ -257,6 +257,17 @@ public function failover($to = null, $abort = false, $timeout = 0): bool`
`257`	`257`	`return $this->lazyObjectReal->failover(...\func_get_args());`
`258`	`258`	`}`
`259`	`259`
	`260`	`+ public function expiretime($key): \Redis\|false\|int`
	`261`	`+ {`
	`262`	`+ return $this->lazyObjectReal->expiretime(...\func_get_args());`
	`263`	`+ }`
	`264`	`+`
	`265`	`+ public function pexpiretime($key): \Redis\|false\|int`
	`266`	`+ {`
	`267`	`+ return $this->lazyObjectReal->pexpiretime(...\func_get_args());`
	`268`	`+ }`
	`269`	`+`
	`270`	`+`
`260`	`271`	`public function flushAll($sync = null): bool`
`261`	`272`	`{`
`262`	`273`	`return $this->lazyObjectReal->flushAll(...\func_get_args());`
`@@ -382,6 +393,11 @@ public function getRange($key, $start, $end)`
`382`	`393`	`return $this->lazyObjectReal->getRange(...\func_get_args());`
`383`	`394`	`}`
`384`	`395`
	`396`	`+ public function lcs($key1, $key2, $options = null): \Redis\|array\|false\|int\|string`
	`397`	`+ {`
	`398`	`+ return $this->lazyObjectReal->lcs(...\func_get_args());`
	`399`	`+ }`
	`400`	`+`
`385`	`401`	`public function getReadTimeout(): int`
`386`	`402`	`{`
`387`	`403`	`return $this->lazyObjectReal->getReadTimeout(...\func_get_args());`
`@@ -767,6 +783,11 @@ public function sInter($key, ...$other_keys): array`
`767`	`783`	`return $this->lazyObjectReal->sInter(...\func_get_args());`
`768`	`784`	`}`
`769`	`785`
	`786`	`+ public function sintercard($keys, $limit = -1): \Redis\|false\|int`
	`787`	`+ {`
	`788`	`+ return $this->lazyObjectReal->sintercard(...\func_get_args());`
	`789`	`+ }`
	`790`	`+`
`770`	`791`	`public function sInterStore($dst, $key, ...$other_keys): int`
`771`	`792`	`{`
`772`	`793`	`return $this->lazyObjectReal->sInterStore(...\func_get_args());`
`@@ -1162,6 +1183,11 @@ public function zinter($keys, $weights = null, $options = null): array`
`1162`	`1183`	`return $this->lazyObjectReal->zinter(...\func_get_args());`
`1163`	`1184`	`}`
`1164`	`1185`
	`1186`	`+ public function zintercard(array $keys, int $limit = -1): \Redis\|false\|int`
	`1187`	`+ {`
	`1188`	`+ return $this->lazyObjectReal->zintercard(...\func_get_args());`
	`1189`	`+ }`
	`1190`	`+`
`1165`	`1191`	`public function zinterstore($dst, $keys, $weights = null, $aggregate = null): int`
`1166`	`1192`	`{`
`1167`	`1193`	`return $this->lazyObjectReal->zinterstore(...\func_get_args());`