port changes from v1.1 branch

src/Command/Command.php

@@ -92,7 +92,7 @@ public function parseResponse($data)
      */
     public static function normalizeArguments(array $arguments)
     {
-        if (count($arguments) === 1 && is_array($arguments[0])) {
+        if (count($arguments) === 1 && isset($arguments[0]) && is_array($arguments[0])) {
             return $arguments[0];
         }
 

src/Command/Processor/ProcessorChain.php

@@ -71,7 +71,7 @@ public function getProcessors()
     /**
      * Returns an iterator over the list of command processor in the chain.
      *
-     * @return \ArrayIterator
+     * @return \Traversable<int, ProcessorInterface>
      */
     public function getIterator()
     {

src/CommunicationException.php

@@ -34,9 +34,13 @@ public function __construct(
         $code = 0,
         \Exception $innerException = null
     ) {
-        $this->connection = $connection;
+        parent::__construct(
+            is_null($message) ? '' : $message,
+            is_null($code) ? 0 : $code,
+            $innerException
+        );
 
-        parent::__construct($message, $code, $innerException);
+        $this->connection = $connection;
     }
 
     /**

src/Connection/PhpiredisSocketConnection.php

@@ -66,9 +66,9 @@ public function __construct(ParametersInterface $parameters)
      */
     public function __destruct()
     {
-        phpiredis_reader_destroy($this->reader);
-
         parent::__destruct();
+
+        phpiredis_reader_destroy($this->reader);
     }
 
     /**
@@ -342,7 +342,9 @@ public function connect()
     public function disconnect()
     {
         if ($this->isConnected()) {
+            phpiredis_reader_reset($this->reader);
             socket_close($this->getResource());
+
             parent::disconnect();
         }
     }

src/Connection/PhpiredisStreamConnection.php

@@ -67,9 +67,19 @@ public function __construct(ParametersInterface $parameters)
      */
     public function __destruct()
     {
+        parent::__destruct();
+
         phpiredis_reader_destroy($this->reader);
+    }
 
-        parent::__destruct();
+    /**
+     * {@inheritdoc}
+     */
+    public function disconnect()
+    {
+        phpiredis_reader_reset($this->reader);
+
+        parent::disconnect();
     }
 
     /**

src/Connection/Replication/SentinelReplication.php

@@ -20,6 +20,7 @@
 use Predis\Connection\Parameters;
 use Predis\Replication\ReplicationStrategy;
 use Predis\Replication\RoleException;
+use Predis\Response\Error;
 use Predis\Response\ErrorInterface as ErrorResponseInterface;
 use Predis\Response\ServerException;
 
@@ -151,14 +152,14 @@ public function setRetryLimit($retry)
     }
 
     /**
-     * Sets the time to wait (in seconds) before fetching a new configuration
+     * Sets the time to wait (in milliseconds) before fetching a new configuration
      * from one of the sentinels.
      *
-     * @param float $seconds Time to wait before the next attempt.
+     * @param float $milliseconds Time to wait before the next attempt.
      */
-    public function setRetryWait($seconds)
+    public function setRetryWait($milliseconds)
     {
-        $this->retryWait = (float) $seconds;
+        $this->retryWait = (float) $milliseconds;
     }
 
     /**
@@ -254,12 +255,15 @@ protected function createSentinelConnection($parameters)
         }
 
         if (is_array($parameters)) {
-            // Password authentication is fine now that Redis Sentinel supports
-            // password-protected sentinel instances, but we must explicitly set
-            // "database" and "username" to NULL so that no augmented AUTH (ACL)
-            // and SELECT command are sent by accident to the sentinels.
+            // NOTE: sentinels do not accept AUTH and SELECT commands so we must
+            // explicitly set them to NULL to avoid problems when using default
+            // parameters set via client options. Actually AUTH is supported for
+            // sentinels starting with Redis 5 but we have to differentiate from
+            // sentinels passwords and nodes passwords, this will be implemented
+            // in a later release.
             $parameters['database'] = null;
             $parameters['username'] = null;
+            $parameters['password'] = null;
 
             if (!isset($parameters['timeout'])) {
                 $parameters['timeout'] = $this->sentinelTimeout;
@@ -534,13 +538,17 @@ private function getConnectionInternal(CommandInterface $command)
      * @param NodeConnectionInterface $connection Connection to a redis server.
      * @param string                  $role       Expected role of the server ("master", "slave" or "sentinel").
      *
-     * @throws RoleException
+     * @throws RoleException|ConnectionException
      */
     protected function assertConnectionRole(NodeConnectionInterface $connection, $role)
     {
         $role = strtolower($role);
         $actualRole = $connection->executeCommand(RawCommand::create('ROLE'));
 
+        if ($actualRole instanceof Error) {
+            throw new ConnectionException($connection, $actualRole->getMessage());
+        }
+
         if ($role !== $actualRole[0]) {
             throw new RoleException($connection, "Expected $role but got $actualRole[0] [$connection]");
         }

src/Connection/StreamConnection.php

@@ -360,7 +360,7 @@ public function writeRequest(CommandInterface $command)
         $buffer = "*{$reqlen}\r\n\${$cmdlen}\r\n{$commandID}\r\n";
 
         foreach ($arguments as $argument) {
-            $arglen = strlen($argument);
+            $arglen = strlen(strval($argument));
             $buffer .= "\${$arglen}\r\n{$argument}\r\n";
         }
 

src/Session/Handler.php

@@ -54,6 +54,7 @@ public function register()
     /**
      * {@inheritdoc}
      */
+    #[\ReturnTypeWillChange]
     public function open($save_path, $session_id)
     {
         // NOOP
@@ -63,6 +64,7 @@ public function open($save_path, $session_id)
     /**
      * {@inheritdoc}
      */
+    #[\ReturnTypeWillChange]
     public function close()
     {
         // NOOP
@@ -72,6 +74,7 @@ public function close()
     /**
      * {@inheritdoc}
      */
+    #[\ReturnTypeWillChange]
     public function gc($maxlifetime)
     {
         // NOOP
@@ -81,6 +84,7 @@ public function gc($maxlifetime)
     /**
      * {@inheritdoc}
      */
+    #[\ReturnTypeWillChange]
     public function read($session_id)
     {
         if ($data = $this->client->get($session_id)) {
@@ -92,6 +96,7 @@ public function read($session_id)
     /**
      * {@inheritdoc}
      */
+    #[\ReturnTypeWillChange]
     public function write($session_id, $session_data)
     {
         $this->client->setex($session_id, $this->ttl, $session_data);
@@ -102,6 +107,7 @@ public function write($session_id, $session_data)
     /**
      * {@inheritdoc}
      */
+    #[\ReturnTypeWillChange]
     public function destroy($session_id)
     {
         $this->client->del($session_id);

src/Transaction/AbortedMultiExecException.php

@@ -29,7 +29,8 @@ class AbortedMultiExecException extends PredisException
      */
     public function __construct(MultiExec $transaction, $message, $code = 0)
     {
-        parent::__construct($message, $code);
+        parent::__construct($message, is_null($code) ? 0 : $code);
+
         $this->transaction = $transaction;
     }