Update CHANGELOG and bump VERSION.

Authentication for sentinels was implemented in v1.1.5 (commit 2e76410)
but ended up being bugged (see ISSUE #658). This is now postponed as it
requires a more thorough investigation.

CHANGELOG.md

@@ -1,7 +1,15 @@
+v1.1.6 (2020-09-11)
+================================================================================
+
+- __FIX__: reverted support for sentinels authentication implemented in v1.1.5
+as it was bugged (see ISSUE #658), sorry for the trouble. This is now postponed
+as it requires a more thorough investigation.
+
+
 v1.1.5 (2020-09-10)
 ================================================================================
 
-- __FIX__: authentication for sentinels is now supported, previously it was not
+- __FIX__:~~authentication for sentinels is now supported, previously it was not
 possible to specify a `password` for sentinels as its value was stripped during
 initialization because sentinels did not support authentication until Redis 5.
 **Please note** that with the current implementation each sentinel must have
@@ -9,7 +17,7 @@ its own `password` parameter set in the parameters list despite this password is
 the same for all sentinels (read how `requirepass` works on the Redis docs). In
 this case you should avoid using the global `parameters` client option used to
 set default parameters for every connection created by Predis as this would end
-up using the same password even when connecting to actual Redis nodes.
+up using the same password even when connecting to actual Redis nodes.~~
 
 - __FIX__: the username is now correctly retrieved from the userinfo fragment of
 the URI when using the "redis" scheme and a "username:password" pair is present.

package.ini

@@ -11,7 +11,7 @@ desc        = "Flexible and feature-complete Redis client for PHP and HHVM"
 homepage    = "http://github.com/nrk/predis"
 license     = "MIT"
 version     = "1.1.6"
-stability   = "devel"
+stability   = "stable"
 channel     = "pear.nrk.io"
 
 author      = "Daniele Alessandri \"nrk\" <suppakilla@gmail.com>"

src/Client.php

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

src/Connection/Aggregate/SentinelReplication.php

@@ -239,12 +239,15 @@ class SentinelReplication implements ReplicationInterface
         }
 
         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;

tests/Predis/Connection/Aggregate/SentinelReplicationTest.php

@@ -36,29 +36,19 @@ class SentinelReplicationTest extends PredisTestCase
     /**
      * @group disconnected
      */
-    public function testParametersForSentinelConnectionShouldUsePasswordForAuthentication()
+    public function testParametersForSentinelConnectionShouldNotUseDatabaseAndUsernameAndPassword()
     {
         $replication = $this->getReplicationConnection('svc', array(
-            'tcp://127.0.0.1:5381?alias=sentinel1&password=secret',
+            'tcp://127.0.0.1:5381?alias=sentinel1&database=1&username=myusername&password=secret',
         ));
 
         $parameters = $replication->getSentinelConnection()->getParameters()->toArray();
 
-        $this->assertArraySubset(array('password' => 'secret'), $parameters);
-    }
-
-    /**
-     * @group disconnected
-     */
-    public function testParametersForSentinelConnectionShouldNotUseDatabaseAndUsername()
-    {
-        $replication = $this->getReplicationConnection('svc', array(
-            'tcp://127.0.0.1:5381?alias=sentinel1&database=1&username=myusername',
-        ));
-
-        $parameters = $replication->getSentinelConnection()->getParameters()->toArray();
-
-        $this->assertArraySubset(array('database' => null, 'username' => null), $parameters);
+        $this->assertArraySubset(array(
+            'database' => null,
+            'username' => null,
+            'password' => null
+        ), $parameters);
     }
 
     /**