mention php version [no ci]

* Add retry logic to support temporary redis cluster failure

* formatting

* Use exponential backoff retries.
$minRetryAfter cant be changed if needed with RedisCluster::setMinRetryAfter

* fix formating

* (hotfix) formaing + import import  \Predis\Response\Error and \Predis\Connection\ConnectionException

* Update RedisCluster.php

* formatting

* tweaks

* Update RedisCluster.php

* Update RedisCluster.php

* Update RedisCluster.php

* Update unit tests regarding renaming of "retryInterval"

* spacing

Co-authored-by: Till Krüss <tillkruss@users.noreply.github.com>

.github/workflows/tests.yml

@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['7.2', '7.3', '7.4', '8.0', '8.1']
+        php-versions: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
         redis-versions: ['3', '4', '5', '6', '7']
 
     steps:

CHANGELOG.md

@@ -1,5 +1,15 @@
 ## Changelog
 
+## v2.0.2 (2022-09-06)
+
+- Fixed PHP 8.2 deprecation notice: Use of "static" in callables
+
+## v2.0.1 (2022-09-04)
+
+- Added retry interval to `RedisCluster` with a default of `10ms`
+- Avoid PHP 8.2 warning in `Connection\Parameters`
+- Fixed Sentinel reconnect issue in long-running PHP processes
+
 ## v2.0.0 (2022-06-08)
 
 - Dropped support for PHP 7.1 and older

README.md

@@ -35,6 +35,10 @@ This library can be found on [Packagist](http://packagist.org/packages/predis/pr
 management of projects dependencies using [Composer](http://packagist.org/about-composer).
 Compressed archives of each release are [available on GitHub](https://github.com/predis/predis/releases).
 
+```shell
+composer require predis/predis
+```
+
 
 ### Loading the library ###
 

VERSION

@@ -1 +1 @@
-2.0.0
+2.0.2

src/Client.php

@@ -40,7 +40,7 @@ use Predis\Transaction\MultiExec as MultiExecTransaction;
  */
 class Client implements ClientInterface, \IteratorAggregate
 {
-    const VERSION = '2.0.0';
+    const VERSION = '2.0.2';
 
     /** @var OptionsInterface */
     private $options;

src/ClientInterface.php

@@ -25,157 +25,157 @@ use Predis\Response\Status;
  * and more friendly interface to ease programming which is described in the
  * following list of methods:
  *
- * @method int         del(string[]|string $keyOrKeys, string ...$keys = null)
- * @method string|null dump(string $key)
- * @method int         exists(string $key)
- * @method int         expire(string $key, int $seconds)
- * @method int         expireat(string $key, int $timestamp)
- * @method array       keys(string $pattern)
- * @method int         move(string $key, int $db)
- * @method mixed       object($subcommand, string $key)
- * @method int         persist(string $key)
- * @method int         pexpire(string $key, int $milliseconds)
- * @method int         pexpireat(string $key, int $timestamp)
- * @method int         pttl(string $key)
- * @method string|null randomkey()
- * @method mixed       rename(string $key, string $target)
- * @method int         renamenx(string $key, string $target)
- * @method array       scan($cursor, array $options = null)
- * @method array       sort(string $key, array $options = null)
- * @method int         ttl(string $key)
- * @method mixed       type(string $key)
- * @method int         append(string $key, $value)
- * @method int         bitcount(string $key, $start = null, $end = null)
- * @method int         bitop($operation, $destkey, $key)
- * @method array|null  bitfield(string $key, $subcommand, ...$subcommandArg)
- * @method int         bitpos(string $key, $bit, $start = null, $end = null)
- * @method int         decr(string $key)
- * @method int         decrby(string $key, int $decrement)
- * @method string|null get(string $key)
- * @method int         getbit(string $key, $offset)
- * @method string      getrange(string $key, $start, $end)
- * @method string|null getset(string $key, $value)
- * @method int         incr(string $key)
- * @method int         incrby(string $key, int $increment)
- * @method string      incrbyfloat(string $key, int|float $increment)
- * @method array       mget(string[]|string $keyOrKeys, string ...$keys = null)
- * @method mixed       mset(array $dictionary)
- * @method int         msetnx(array $dictionary)
- * @method Status      psetex(string $key, $milliseconds, $value)
- * @method Status      set(string $key, $value, $expireResolution = null, $expireTTL = null, $flag = null)
- * @method int         setbit(string $key, $offset, $value)
- * @method Status      setex(string $key, $seconds, $value)
- * @method int         setnx(string $key, $value)
- * @method int         setrange(string $key, $offset, $value)
- * @method int         strlen(string $key)
- * @method int         hdel(string $key, array $fields)
- * @method int         hexists(string $key, string $field)
- * @method string|null hget(string $key, string $field)
- * @method array       hgetall(string $key)
- * @method int         hincrby(string $key, string $field, int $increment)
- * @method string      hincrbyfloat(string $key, string $field, int|float $increment)
- * @method array       hkeys(string $key)
- * @method int         hlen(string $key)
- * @method array       hmget(string $key, array $fields)
- * @method mixed       hmset(string $key, array $dictionary)
- * @method array       hscan(string $key, $cursor, array $options = null)
- * @method int         hset(string $key, string $field, string $value)
- * @method int         hsetnx(string $key, string $field, string $value)
- * @method array       hvals(string $key)
- * @method int         hstrlen(string $key, string $field)
- * @method array|null  blpop(array|string $keys, int|float $timeout)
- * @method array|null  brpop(array|string $keys, int|float $timeout)
- * @method string|null brpoplpush(string $source, string $destination, int|float $timeout)
- * @method string|null lindex(string $key, int $index)
- * @method int         linsert(string $key, $whence, $pivot, $value)
- * @method int         llen(string $key)
- * @method string|null lpop(string $key)
- * @method int         lpush(string $key, array $values)
- * @method int         lpushx(string $key, array $values)
- * @method string[]    lrange(string $key, int $start, int $stop)
- * @method int         lrem(string $key, int $count, string $value)
- * @method mixed       lset(string $key, int $index, string $value)
- * @method mixed       ltrim(string $key, int $start, int $stop)
- * @method string|null rpop(string $key)
- * @method string|null rpoplpush(string $source, string $destination)
- * @method int         rpush(string $key, array $values)
- * @method int         rpushx(string $key, array $values)
- * @method int         sadd(string $key, array $members)
- * @method int         scard(string $key)
- * @method string[]    sdiff(array|string $keys)
- * @method int         sdiffstore(string $destination, array|string $keys)
- * @method string[]    sinter(array|string $keys)
- * @method int         sinterstore(string $destination, array|string $keys)
- * @method int         sismember(string $key, string $member)
- * @method string[]    smembers(string $key)
- * @method int         smove(string $source, string $destination, string $member)
- * @method string|null spop(string $key, int $count = null)
- * @method string|null srandmember(string $key, int $count = null)
- * @method int         srem(string $key, string $member)
- * @method array       sscan(string $key, int $cursor, array $options = null)
- * @method string[]    sunion(array|string $keys)
- * @method int         sunionstore(string $destination, array|string $keys)
- * @method int         touch(string[]|string $keyOrKeys, string ...$keys = null)
- * @method int         zadd(string $key, array $membersAndScoresDictionary)
- * @method int         zcard(string $key)
- * @method string      zcount(string $key, int|string $min, int|string $max)
- * @method string      zincrby(string $key, int $increment, string $member)
- * @method int         zinterstore(string $destination, array|string $keys, array $options = null)
- * @method array       zpopmin(string $key, int $count = 1)
- * @method array       zpopmax(string $key, int $count = 1)
- * @method array       zrange(string $key, int|string $start, int|string $stop, array $options = null)
- * @method array       zrangebyscore(string $key, int|string $min, int|string $max, array $options = null)
- * @method int|null    zrank(string $key, string $member)
- * @method int         zrem(string $key, string ...$member)
- * @method int         zremrangebyrank(string $key, int|string $start, int|string $stop)
- * @method int         zremrangebyscore(string $key, int|string $min, int|string $max)
- * @method array       zrevrange(string $key, int|string $start, int|string $stop, array $options = null)
- * @method array       zrevrangebyscore(string $key, int|string $max, int|string $min, array $options = null)
- * @method int|null    zrevrank(string $key, string $member)
- * @method int         zunionstore(string $destination, array|string $keys, array $options = null)
- * @method string|null zscore(string $key, string $member)
- * @method array       zscan(string $key, int $cursor, array $options = null)
- * @method array       zrangebylex(string $key, string $start, string $stop, array $options = null)
- * @method array       zrevrangebylex(string $key, string $start, string $stop, array $options = null)
- * @method int         zremrangebylex(string $key, string $min, string $max)
- * @method int         zlexcount(string $key, string $min, string $max)
- * @method int         pfadd(string $key, array $elements)
- * @method mixed       pfmerge(string $destinationKey, array|string $sourceKeys)
- * @method int         pfcount(string[]|string $keyOrKeys, string ...$keys = null)
- * @method mixed       pubsub($subcommand, $argument)
- * @method int         publish($channel, $message)
- * @method mixed       discard()
- * @method array|null  exec()
- * @method mixed       multi()
- * @method mixed       unwatch()
- * @method mixed       watch(string $key)
- * @method mixed       eval(string $script, int $numkeys, string ...$keyOrArg = null)
- * @method mixed       evalsha(string $script, int $numkeys, string ...$keyOrArg = null)
- * @method mixed       script($subcommand, $argument = null)
- * @method mixed       auth(string $password)
- * @method string      echo(string $message)
- * @method mixed       ping(string $message = null)
- * @method mixed       select(int $database)
- * @method mixed       bgrewriteaof()
- * @method mixed       bgsave()
- * @method mixed       client($subcommand, $argument = null)
- * @method mixed       config($subcommand, $argument = null)
- * @method int         dbsize()
- * @method mixed       flushall()
- * @method mixed       flushdb()
- * @method array       info($section = null)
- * @method int         lastsave()
- * @method mixed       save()
- * @method mixed       slaveof(string $host, int $port)
- * @method mixed       slowlog($subcommand, $argument = null)
- * @method array       time()
- * @method array       command()
- * @method int         geoadd(string $key, $longitude, $latitude, $member)
- * @method array       geohash(string $key, array $members)
- * @method array       geopos(string $key, array $members)
- * @method string|null geodist(string $key, $member1, $member2, $unit = null)
- * @method array       georadius(string $key, $longitude, $latitude, $radius, $unit, array $options = null)
- * @method array       georadiusbymember(string $key, $member, $radius, $unit, array $options = null)
+ * @method int               del(string[]|string $keyOrKeys, string ...$keys = null)
+ * @method string|null       dump(string $key)
+ * @method int               exists(string $key)
+ * @method int               expire(string $key, int $seconds)
+ * @method int               expireat(string $key, int $timestamp)
+ * @method array             keys(string $pattern)
+ * @method int               move(string $key, int $db)
+ * @method mixed             object($subcommand, string $key)
+ * @method int               persist(string $key)
+ * @method int               pexpire(string $key, int $milliseconds)
+ * @method int               pexpireat(string $key, int $timestamp)
+ * @method int               pttl(string $key)
+ * @method string|null       randomkey()
+ * @method mixed             rename(string $key, string $target)
+ * @method int               renamenx(string $key, string $target)
+ * @method array             scan($cursor, array $options = null)
+ * @method array             sort(string $key, array $options = null)
+ * @method int               ttl(string $key)
+ * @method mixed             type(string $key)
+ * @method int               append(string $key, $value)
+ * @method int               bitcount(string $key, $start = null, $end = null)
+ * @method int               bitop($operation, $destkey, $key)
+ * @method array|null        bitfield(string $key, $subcommand, ...$subcommandArg)
+ * @method int               bitpos(string $key, $bit, $start = null, $end = null)
+ * @method int               decr(string $key)
+ * @method int               decrby(string $key, int $decrement)
+ * @method string|null       get(string $key)
+ * @method int               getbit(string $key, $offset)
+ * @method string            getrange(string $key, $start, $end)
+ * @method string|null       getset(string $key, $value)
+ * @method int               incr(string $key)
+ * @method int               incrby(string $key, int $increment)
+ * @method string            incrbyfloat(string $key, int|float $increment)
+ * @method array             mget(string[]|string $keyOrKeys, string ...$keys = null)
+ * @method mixed             mset(array $dictionary)
+ * @method int               msetnx(array $dictionary)
+ * @method Status            psetex(string $key, $milliseconds, $value)
+ * @method Status            set(string $key, $value, $expireResolution = null, $expireTTL = null, $flag = null)
+ * @method int               setbit(string $key, $offset, $value)
+ * @method Status            setex(string $key, $seconds, $value)
+ * @method int               setnx(string $key, $value)
+ * @method int               setrange(string $key, $offset, $value)
+ * @method int               strlen(string $key)
+ * @method int               hdel(string $key, array $fields)
+ * @method int               hexists(string $key, string $field)
+ * @method string|null       hget(string $key, string $field)
+ * @method array             hgetall(string $key)
+ * @method int               hincrby(string $key, string $field, int $increment)
+ * @method string            hincrbyfloat(string $key, string $field, int|float $increment)
+ * @method array             hkeys(string $key)
+ * @method int               hlen(string $key)
+ * @method array             hmget(string $key, array $fields)
+ * @method mixed             hmset(string $key, array $dictionary)
+ * @method array             hscan(string $key, $cursor, array $options = null)
+ * @method int               hset(string $key, string $field, string $value)
+ * @method int               hsetnx(string $key, string $field, string $value)
+ * @method array             hvals(string $key)
+ * @method int               hstrlen(string $key, string $field)
+ * @method array|null        blpop(array|string $keys, int|float $timeout)
+ * @method array|null        brpop(array|string $keys, int|float $timeout)
+ * @method string|null       brpoplpush(string $source, string $destination, int|float $timeout)
+ * @method string|null       lindex(string $key, int $index)
+ * @method int               linsert(string $key, $whence, $pivot, $value)
+ * @method int               llen(string $key)
+ * @method string|null       lpop(string $key)
+ * @method int               lpush(string $key, array $values)
+ * @method int               lpushx(string $key, array $values)
+ * @method string[]          lrange(string $key, int $start, int $stop)
+ * @method int               lrem(string $key, int $count, string $value)
+ * @method mixed             lset(string $key, int $index, string $value)
+ * @method mixed             ltrim(string $key, int $start, int $stop)
+ * @method string|null       rpop(string $key)
+ * @method string|null       rpoplpush(string $source, string $destination)
+ * @method int               rpush(string $key, array $values)
+ * @method int               rpushx(string $key, array $values)
+ * @method int               sadd(string $key, array $members)
+ * @method int               scard(string $key)
+ * @method string[]          sdiff(array|string $keys)
+ * @method int               sdiffstore(string $destination, array|string $keys)
+ * @method string[]          sinter(array|string $keys)
+ * @method int               sinterstore(string $destination, array|string $keys)
+ * @method int               sismember(string $key, string $member)
+ * @method string[]          smembers(string $key)
+ * @method int               smove(string $source, string $destination, string $member)
+ * @method string|array|null spop(string $key, int $count = null)
+ * @method string|null       srandmember(string $key, int $count = null)
+ * @method int               srem(string $key, array|string $member)
+ * @method array             sscan(string $key, int $cursor, array $options = null)
+ * @method string[]          sunion(array|string $keys)
+ * @method int               sunionstore(string $destination, array|string $keys)
+ * @method int               touch(string[]|string $keyOrKeys, string ...$keys = null)
+ * @method int               zadd(string $key, array $membersAndScoresDictionary)
+ * @method int               zcard(string $key)
+ * @method string            zcount(string $key, int|string $min, int|string $max)
+ * @method string            zincrby(string $key, int $increment, string $member)
+ * @method int               zinterstore(string $destination, array|string $keys, array $options = null)
+ * @method array             zpopmin(string $key, int $count = 1)
+ * @method array             zpopmax(string $key, int $count = 1)
+ * @method array             zrange(string $key, int|string $start, int|string $stop, array $options = null)
+ * @method array             zrangebyscore(string $key, int|string $min, int|string $max, array $options = null)
+ * @method int|null          zrank(string $key, string $member)
+ * @method int               zrem(string $key, string ...$member)
+ * @method int               zremrangebyrank(string $key, int|string $start, int|string $stop)
+ * @method int               zremrangebyscore(string $key, int|string $min, int|string $max)
+ * @method array             zrevrange(string $key, int|string $start, int|string $stop, array $options = null)
+ * @method array             zrevrangebyscore(string $key, int|string $max, int|string $min, array $options = null)
+ * @method int|null          zrevrank(string $key, string $member)
+ * @method int               zunionstore(string $destination, array|string $keys, array $options = null)
+ * @method string|null       zscore(string $key, string $member)
+ * @method array             zscan(string $key, int $cursor, array $options = null)
+ * @method array             zrangebylex(string $key, string $start, string $stop, array $options = null)
+ * @method array             zrevrangebylex(string $key, string $start, string $stop, array $options = null)
+ * @method int               zremrangebylex(string $key, string $min, string $max)
+ * @method int               zlexcount(string $key, string $min, string $max)
+ * @method int               pfadd(string $key, array $elements)
+ * @method mixed             pfmerge(string $destinationKey, array|string $sourceKeys)
+ * @method int               pfcount(string[]|string $keyOrKeys, string ...$keys = null)
+ * @method mixed             pubsub($subcommand, $argument)
+ * @method int               publish($channel, $message)
+ * @method mixed             discard()
+ * @method array|null        exec()
+ * @method mixed             multi()
+ * @method mixed             unwatch()
+ * @method mixed             watch(string $key)
+ * @method mixed             eval(string $script, int $numkeys, string ...$keyOrArg = null)
+ * @method mixed             evalsha(string $script, int $numkeys, string ...$keyOrArg = null)
+ * @method mixed             script($subcommand, $argument = null)
+ * @method mixed             auth(string $password)
+ * @method string            echo(string $message)
+ * @method mixed             ping(string $message = null)
+ * @method mixed             select(int $database)
+ * @method mixed             bgrewriteaof()
+ * @method mixed             bgsave()
+ * @method mixed             client($subcommand, $argument = null)
+ * @method mixed             config($subcommand, $argument = null)
+ * @method int               dbsize()
+ * @method mixed             flushall()
+ * @method mixed             flushdb()
+ * @method array             info($section = null)
+ * @method int               lastsave()
+ * @method mixed             save()
+ * @method mixed             slaveof(string $host, int $port)
+ * @method mixed             slowlog($subcommand, $argument = null)
+ * @method array             time()
+ * @method array             command()
+ * @method int               geoadd(string $key, $longitude, $latitude, $member)
+ * @method array             geohash(string $key, array $members)
+ * @method array             geopos(string $key, array $members)
+ * @method string|null       geodist(string $key, $member1, $member2, $unit = null)
+ * @method array             georadius(string $key, $longitude, $latitude, $radius, $unit, array $options = null)
+ * @method array             georadiusbymember(string $key, $member, $radius, $unit, array $options = null)
  *
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */

src/Command/Processor/KeyPrefixProcessor.php

@@ -197,7 +197,14 @@ class KeyPrefixProcessor implements ProcessorInterface
         if ($command instanceof PrefixableCommandInterface) {
             $command->prefixKeys($this->prefix);
         } elseif (isset($this->commands[$commandID = strtoupper($command->getId())])) {
-            call_user_func($this->commands[$commandID], $command, $this->prefix);
+            $callable = $this->commands[$commandID];
+
+            if (is_string($callable) && strpos($callable, 'static::') === 0) {
+                $callable = explode('::', $this->commands[$commandID]);
+                $callable[0] = $this;
+            }
+
+            call_user_func($callable, $command, $this->prefix);
         }
     }
 

src/Connection/Cluster/RedisCluster.php

@@ -22,6 +22,8 @@ use Predis\Connection\FactoryInterface;
 use Predis\Connection\NodeConnectionInterface;
 use Predis\NotSupportedException;
 use Predis\Response\ErrorInterface as ErrorResponseInterface;
+use Predis\Response\ServerException;
+use Predis\Response\Error as ErrorResponse;
 
 /**
  * Abstraction for a Redis-backed cluster of nodes (Redis >= 3.0.0).
@@ -54,6 +56,7 @@ class RedisCluster implements ClusterInterface, \IteratorAggregate, \Countable
     private $strategy;
     private $connections;
     private $retryLimit = 5;
+    private $retryInterval = 10;
 
     /**
      * @param FactoryInterface  $connections Optional connection factory.
@@ -82,6 +85,26 @@ class RedisCluster implements ClusterInterface, \IteratorAggregate, \Countable
         $this->retryLimit = (int) $retry;
     }
 
+    /**
+     * Sets the initial retry interval (milliseconds).
+     * 
+     * @param int $retryInterval Milliseconds between retries.
+     */
+    public function setRetryInterval($retryInterval)
+    {
+        $this->retryInterval = (int) $retryInterval;
+    }
+
+    /**
+     * Returns the retry interval (milliseconds).
+     *
+     * @return int Milliseconds between retries.
+     */
+    public function getRetryInterval()
+    {
+        return (int) $this->retryInterval;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -207,6 +230,7 @@ class RedisCluster implements ClusterInterface, \IteratorAggregate, \Countable
     private function queryClusterNodeForSlotMap(NodeConnectionInterface $connection)
     {
         $retries = 0;
+        $retryAfter = $this->retryInterval;
         $command = RawCommand::create('CLUSTER', 'SLOTS');
 
         RETRY_COMMAND: {
@@ -226,7 +250,10 @@ class RedisCluster implements ClusterInterface, \IteratorAggregate, \Countable
                     throw new ClientException('No connections left in the pool for `CLUSTER SLOTS`');
                 }
 
+                usleep($retryAfter * 1000);
+                $retryAfter = $retryAfter * 2;
                 ++$retries;
+
                 goto RETRY_COMMAND;
             }
         }
@@ -482,24 +509,40 @@ class RedisCluster implements ClusterInterface, \IteratorAggregate, \Countable
      */
     private function retryCommandOnFailure(CommandInterface $command, $method)
     {
-        $failure = false;
+        $retries = 0;
+        $retryAfter = $this->retryInterval;
 
         RETRY_COMMAND: {
             try {
                 $response = $this->getConnectionByCommand($command)->$method($command);
-            } catch (ConnectionException $exception) {
-                $connection = $exception->getConnection();
-                $connection->disconnect();
 
-                $this->remove($connection);
+                if ($response instanceof ErrorResponse) {
+                    $message = $response->getMessage();
 
-                if ($failure) {
+                    if (strpos($message, 'CLUSTERDOWN') !== false) {
+                        throw new ServerException($message);
+                    }
+                }
+            } catch (\Throwable $exception) {
+                usleep($retryAfter * 1000);
+                $retryAfter = $retryAfter * 2;
+
+                if ($exception instanceof ConnectionException) {
+                    $connection = $exception->getConnection();
+                    
+                    if ($connection) {
+                        $connection->disconnect();
+                        $this->remove($connection);
+                    }
+                }
+
+                if ($retries === $this->retryLimit) {
                     throw $exception;
                 } elseif ($this->useClusterSlots) {
                     $this->askSlotMap();
                 }
 
-                $failure = true;
+                ++$retries;
 
                 goto RETRY_COMMAND;
             }

src/Connection/Parameters.php

@@ -26,6 +26,14 @@ class Parameters implements ParametersInterface
         'port' => 6379,
     );
 
+    /**
+     * Set of connection paramaters already filtered
+     * for NULL or 0-length string values.
+     * 
+     * @var array
+     */
+    protected $parameters;
+
     /**
      * @param array $parameters Named array of connection parameters.
      */

src/Connection/Replication/SentinelReplication.php

@@ -70,6 +70,11 @@ class SentinelReplication implements ReplicationInterface
      */
     protected $sentinels = array();
 
+    /**
+     * @var int
+     */
+    protected $sentinelIndex = 0;
+
     /**
      * @var NodeConnectionInterface
      */
@@ -282,11 +287,13 @@ class SentinelReplication implements ReplicationInterface
     public function getSentinelConnection()
     {
         if (!$this->sentinelConnection) {
-            if (!$this->sentinels) {
+            if ($this->sentinelIndex >= count($this->sentinels)) {
+                $this->sentinelIndex = 0;
                 throw new \Predis\ClientException('No sentinel server available for autodiscovery.');
             }
 
-            $sentinel = array_shift($this->sentinels);
+            $sentinel = $this->sentinels[$this->sentinelIndex];
+            ++$this->sentinelIndex;
             $this->sentinelConnection = $this->createSentinelConnection($sentinel);
         }
 
@@ -307,6 +314,7 @@ class SentinelReplication implements ReplicationInterface
                 );
 
                 $this->sentinels = array();
+                $this->sentinelIndex = 0;
                 // NOTE: sentinel server does not return itself, so we add it back.
                 $this->sentinels[] = $sentinel->getParameters()->toArray();
 

tests/PHPUnit/PredisTestCase.php

@@ -10,6 +10,7 @@
  */
 
 use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Util\Test as TestUtil;
 use Predis\Client;
 use Predis\Command;
 use Predis\Connection;
@@ -315,7 +316,10 @@ abstract class PredisTestCase extends \PHPUnit\Framework\TestCase
      */
     protected function getRequiredRedisServerVersion(): ?string
     {
-        $annotations = $this->getAnnotations();
+        $annotations = TestUtil::parseTestMethodAnnotations(
+            get_class($this),
+            $this->getName(false)
+        );
 
         if (isset($annotations['method']['requiresRedisVersion'], $annotations['method']['group']) &&
             !empty($annotations['method']['requiresRedisVersion']) &&

tests/Predis/Command/Redis/SREM_Test.php

@@ -101,6 +101,22 @@ class SREM_Test extends PredisCommandTestCase
         $this->assertSame(0, $redis->srem('digits', 1));
     }
 
+    /**
+     * @group connected
+     * @requiresRedisVersion >= 2.4.0
+     */
+    public function testRemovesMembersInArrayTypeFromSetVariadic(): void
+    {
+        $redis = $this->getClient();
+
+        $redis->sadd('letters', 'a', 'b', 'c', 'd');
+
+        $this->assertSame(2, $redis->srem('letters', ['b', 'd', 'z']));
+        $this->assertSameValues(array('a', 'c'), $redis->smembers('letters'));
+
+        $this->assertSame(0, $redis->srem('digits', [1]));
+    }
+
     /**
      * @group connected
      */

tests/Predis/Connection/Cluster/RedisClusterTest.php

@@ -1301,4 +1301,144 @@ class RedisClusterTest extends PredisTestCase
 
         $this->assertEquals($cluster, $unserialized);
     }
+
+    /**
+     * @medium
+     * @group disconnected
+     * @group slow 
+     */
+    public function testRetryCommandSuccessOnClusterDownErrors()
+    {
+        $clusterDownError= new Response\Error("CLUSTERDOWN") ;
+
+	    $command = Command\RawCommand::create('get', 'node:1001');
+
+        $connection1 = $this->getMockConnection('tcp://127.0.0.1:6379');
+        $connection1->expects($this->exactly(3))
+                    ->method('executeCommand')
+                    ->with($command)
+                    ->will($this->onConsecutiveCalls(
+                            $clusterDownError,
+                            $clusterDownError,
+                            'foobar'));
+
+        $cluster = new RedisCluster(new Connection\Factory());
+        $cluster->useClusterSlots(false);
+        $cluster->setRetryLimit(2);
+        $cluster->add($connection1);
+
+        $this->assertSame('foobar', $cluster->executeCommand($command));
+    }
+
+    /**
+     * @medium
+     * @group disconnected
+     * @group slow 
+     */
+    public function testRetryCommandFailureOnClusterDownErrors()
+    {
+        $this->expectException('Predis\Response\ServerException');
+        $this->expectExceptionMessage('CLUSTERDOWN');
+
+        $clusterDownError= new Response\Error("CLUSTERDOWN") ;
+
+        $command = Command\RawCommand::create('get', 'node:1001');
+
+        $connection1 = $this->getMockConnection('tcp://127.0.0.1:6379');
+        $connection1->expects($this->exactly(3))
+                    ->method('executeCommand')
+                    ->with($command)
+                    ->will($this->onConsecutiveCalls(
+                            $clusterDownError,
+                            $clusterDownError,
+                            $clusterDownError
+                            ));
+
+
+        $cluster = new RedisCluster(new Connection\Factory());
+        $cluster->useClusterSlots(false);
+        $cluster->setRetryLimit(2);
+        $cluster->add($connection1);
+
+        $cluster->executeCommand($command);
+    }
+
+    /**
+     * @medium
+     * @group disconnected
+     * @group slow 
+     */
+    public function testQueryClusterNodeForSlotMapPauseDurationOnRetry()
+    {
+        $slotsmap = array(
+            array(0, 5460, array('127.0.0.1', 9381), array()),
+            array(5461, 10922, array('127.0.0.1', 6382), array()),
+            array(10923, 16383, array('127.0.0.1', 6383), array()),
+        );
+
+        $connection1 = $this->getMockConnection('tcp://127.0.0.1:6381?slots=0-5460');
+        $connection1
+            ->expects($this->once())
+            ->method('executeCommand')
+            ->with($this->isRedisCommand(
+                'CLUSTER', array('SLOTS')
+            ))
+            ->willThrowException(
+                new Connection\ConnectionException($connection1, 'Unknown connection error [127.0.0.1:6381]')
+            );
+
+        $connection2 = $this->getMockConnection('tcp://127.0.0.1:6382?slots=5461-10922');
+        $connection2
+            ->expects($this->once())
+            ->method('executeCommand')
+            ->with($this->isRedisCommand(
+                'CLUSTER', array('SLOTS')
+            ))
+            ->willThrowException(
+                new Connection\ConnectionException($connection2, 'Unknown connection error [127.0.0.1:6383]')
+            );
+
+        $connection3 = $this->getMockConnection('tcp://127.0.0.1:6383?slots=10923-16383');
+        $connection3
+            ->expects($this->once())
+            ->method('executeCommand')
+            ->with($this->isRedisCommand(
+                'CLUSTER', array('SLOTS')
+            ))
+            ->willReturn($slotsmap);
+
+        $factory = $this->getMockBuilder('Predis\Connection\FactoryInterface')->getMock();
+        $factory
+            ->expects($this->never())
+            ->method('create');
+
+        // TODO: I'm not sure about mocking a protected method, but it'll do for now
+        /** @var Connection\Cluster\RedisCluster|MockObject */
+        $cluster = $this->getMockBuilder('Predis\Connection\Cluster\RedisCluster')
+            ->onlyMethods(array('getRandomConnection'))
+            ->setConstructorArgs(array($factory))
+            ->getMock();
+        $cluster
+            ->expects($this->exactly(3))
+            ->method('getRandomConnection')
+            ->willReturnOnConsecutiveCalls($connection1, $connection2, $connection3);
+
+        $cluster->add($connection1);
+        $cluster->add($connection2);
+        $cluster->add($connection3);
+
+        $cluster->setRetryInterval(2000);
+
+        $startTime = time() ;
+        $cluster->askSlotMap();
+        $endTime = time();
+        $totalTime=$endTime-$startTime;
+        $t1 = $cluster->getRetryInterval()  ;
+        $t2 = $t1 * 2;
+
+        $expectedTime = ($t1 + $t2 )/1000  ; // expected time for 2 retries (fail 1=wait 2s, fail 2=wait 4s , OK)
+        $this->AssertEqualsWithDelta($expectedTime, $totalTime, 1, "Unexpected execution time") ;
+
+        $this->assertCount(16384, $cluster->getSlotMap());
+    }
 }

tests/Predis/Connection/Replication/SentinelReplicationTest.php

@@ -1447,6 +1447,52 @@ class SentinelReplicationTest extends PredisTestCase
         $this->assertEquals($strategy, $unserialized->getReplicationStrategy());
     }
 
+    /**
+     * @group disconnected
+     */
+    public function testMethodGetSentinelConnectionAfterSentinelRestart(): void
+    {
+        $sentinel1 = $this->getMockSentinelConnection('tcp://127.0.0.1:5381?role=sentinel&alias=sentinel1');
+        $sentinel1
+            ->expects($this->exactly(2))
+            ->method('executeCommand')
+            ->with($this->isRedisCommand(
+                'SENTINEL', array('sentinels', 'svc')
+            ))
+            ->willReturnOnConsecutiveCalls(
+                $this->throwException(new Connection\ConnectionException($sentinel1, 'Unknown connection error [127.0.0.1:5381]')),
+                array(
+                    array(
+                        'name', '127.0.0.1:5382',
+                        'ip', '127.0.0.1',
+                        'port', '5382',
+                        'runid', 'f53b52d281be5cdd4873700c94846af8dbe47209',
+                        'flags', 'sentinel',
+                    )
+                )
+            );
+
+        $sentinel2 = $this->getMockSentinelConnection('tcp://127.0.0.1:5382?role=sentinel&alias=sentinel2');
+        $sentinel2
+            ->expects($this->once())
+            ->method('executeCommand')
+            ->with($this->isRedisCommand(
+                'SENTINEL', array('sentinels', 'svc')
+            ))
+            ->willThrowException(
+                new Connection\ConnectionException($sentinel2, 'Unknown connection error [127.0.0.1:5382]')
+            );
+
+        $replication = $this->getReplicationConnection('svc', array($sentinel1, $sentinel2));
+        try {
+            $replication->updateSentinels();
+        } catch (\Predis\ClientException $exception){
+            $this->assertEquals('No sentinel server available for autodiscovery.', $exception->getMessage());
+        }
+
+        $replication->updateSentinels();
+    }
+
     // ******************************************************************** //
     // ---- HELPER METHODS ------------------------------------------------ //
     // ******************************************************************** //