Merge branch 'hotfix/4595' into develop

Forward port zendframework/zendframework#4595

src/Storage/Adapter/RedisOptions.php

@@ -237,4 +237,27 @@ public function getDatabase()
     {
         return $this->getResourceManager()->getDatabase($this->getResourceId());
     }
+
+    /**
+     * Set resource password
+     *
+     * @param string $password Password
+     *
+     * @return RedisOptions
+     */
+    public function setPassword($password)
+    {
+        $this->getResourceManager()->setPassword($this->getResourceId(), $password);
+        return $this;
+    }
+
+    /**
+     * Get resource password
+     *
+     * @return string
+     */
+    public function getPassword()
+    {
+        return $this->getResourceManager()->getPassword($this->getResourceId());
+    }
 }

src/Storage/AdapterPluginManager.php

@@ -33,6 +33,7 @@ class AdapterPluginManager extends AbstractPluginManager
         'filesystem'     => 'Zend\Cache\Storage\Adapter\Filesystem',
         'memcached'      => 'Zend\Cache\Storage\Adapter\Memcached',
         'memory'         => 'Zend\Cache\Storage\Adapter\Memory',
+        'redis'          => 'Zend\Cache\Storage\Adapter\Redis',
         'session'        => 'Zend\Cache\Storage\Adapter\Session',
         'xcache'         => 'Zend\Cache\Storage\Adapter\XCache',
         'wincache'       => 'Zend\Cache\Storage\Adapter\WinCache',

test/Storage/Adapter/RedisTest.php

@@ -261,4 +261,11 @@ public function testOptionsGetSetDatabase()
         $this->assertEquals($database, $this->_options->getDatabase(), 'Database not set correctly using RedisOptions');
     }
 
+    public function testOptionsGetSetPassword()
+    {
+        $password = 'my-secret';
+        $this->_options->setPassword($password);
+        $this->assertEquals($password, $this->_options->getPassword(), 'Password was set incorrectly using RedisOptions');
+    }
+
 }