bump version to 1.1.10 stable

Co-authored-by: Pim Jansen <pjansen@senet.nl>

CHANGELOG.md

@@ -1,7 +1,21 @@
+v1.1.10 (2022-01-05)
+================================================================================
+
+- __FIX__: Avoid PHP 8.1 deprecation notices in `Session/Handler`
+- __FIX__: Fixed "Cannot use object of type Predis\Response\Error as array"
+error in `Connection/Aggregate/SentinelReplication`
+
+
+v1.1.9 (2021-10-05)
+================================================================================
+
+- __FIX__: Fixed PHP 8.1 compatibility in `StreamConnection`
+
+
 v1.1.8 (2021-09-29)
 ================================================================================
 
-- Ensure compatibility with PHP 8.1.
+- __FIX__: Ensure compatibility with PHP 8.1.
 
 
 v1.1.7 (2021-04-04)

VERSION

@@ -1 +1 @@
-1.1.8
+1.1.10

package.ini

@@ -10,7 +10,7 @@ name        = "Predis"
 desc        = "Flexible and feature-complete Redis client for PHP and HHVM"
 homepage    = "http://github.com/nrk/predis"
 license     = "MIT"
-version     = "1.1.8"
+version     = "1.1.10"
 stability   = "stable"
 channel     = "pear.nrk.io"
 

src/Client.php

@@ -40,7 +40,7 @@ use Predis\Transaction\MultiExec as MultiExecTransaction;
  */
 class Client implements ClientInterface, \IteratorAggregate
 {
-    const VERSION = '1.1.8';
+    const VERSION = '1.1.10';
 
     protected $connection;
     protected $options;

src/Connection/Aggregate/SentinelReplication.php

@@ -20,6 +20,7 @@ use Predis\Connection\NodeConnectionInterface;
 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;
 
@@ -523,13 +524,17 @@ class SentinelReplication implements ReplicationInterface
      * @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

@@ -387,7 +387,7 @@ class StreamConnection extends AbstractConnection
         $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

@@ -65,6 +65,7 @@ class Handler implements \SessionHandlerInterface
     /**
      * {@inheritdoc}
      */
+    #[\ReturnTypeWillChange]
     public function open($save_path, $session_id)
     {
         // NOOP
@@ -74,6 +75,7 @@ class Handler implements \SessionHandlerInterface
     /**
      * {@inheritdoc}
      */
+    #[\ReturnTypeWillChange]
     public function close()
     {
         // NOOP
@@ -83,6 +85,7 @@ class Handler implements \SessionHandlerInterface
     /**
      * {@inheritdoc}
      */
+    #[\ReturnTypeWillChange]
     public function gc($maxlifetime)
     {
         // NOOP
@@ -92,6 +95,7 @@ class Handler implements \SessionHandlerInterface
     /**
      * {@inheritdoc}
      */
+    #[\ReturnTypeWillChange]
     public function read($session_id)
     {
         if ($data = $this->client->get($session_id)) {
@@ -103,6 +107,7 @@ class Handler implements \SessionHandlerInterface
     /**
      * {@inheritdoc}
      */
+    #[\ReturnTypeWillChange]
     public function write($session_id, $session_data)
     {
         $this->client->setex($session_id, $this->ttl, $session_data);
@@ -113,6 +118,7 @@ class Handler implements \SessionHandlerInterface
     /**
      * {@inheritdoc}
      */
+    #[\ReturnTypeWillChange]
     public function destroy($session_id)
     {
         $this->client->del($session_id);