Merge pull request zendframework/zendframework#5545. Fix zendframewor…

…k/zendframework#5544 in master

src/Storage/Adapter/RedisResourceManager.php

@@ -93,7 +93,7 @@ protected function connect(array & $resource)
         $redis  = $resource['resource'];
         if ($resource['persistent_id'] !== '') {
             //connect or reuse persistent connection
-            $success = $redis->pconnect($server['host'], $server['port'], $server['timeout'], $server['persistend_id']);
+            $success = $redis->pconnect($server['host'], $server['port'], $server['timeout'], $server['persistent_id']);
         } elseif ($server['port']) {
             $success = $redis->connect($server['host'], $server['port'], $server['timeout']);
         } elseif ($server['timeout']) {

test/Storage/Adapter/RedisResourceManagerTest.php

@@ -0,0 +1,70 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace ZendTest\Cache\Storage\Adapter;
+
+use Zend\Cache\Storage\Adapter\RedisResourceManager;
+
+/**
+ * PHPUnit test case
+ */
+
+/**
+ * @group      Zend_Cache
+ */
+class RedisResourceManagerTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * The resource manager
+     *
+     * @var RedisResourceManager
+     */
+    protected $resourceManager;
+
+    public function setUp()
+    {
+        $this->resourceManager = new RedisResourceManager();
+    }
+
+    /**
+     * Test with 'persistent_id'
+     */
+    public function testValidPersistentId()
+    {
+        $resourceId = 'testValidPersistentId';
+        $resource   = array(
+            'persistent_id' => 1234,
+            'server' => array(
+                'host' => 'localhost'
+            ),
+        );
+        $expectedPersistentId = '1234';
+        $this->resourceManager->setResource($resourceId, $resource);
+        $this->assertSame($expectedPersistentId, $this->resourceManager->getPersistentId($resourceId));
+    }
+
+    /**
+     * Test with 'persistend_id'
+     */
+    public function testNotValidPersistentId()
+    {
+        $resourceId = 'testNotValidPersistentId';
+        $resource   = array(
+            'persistend_id' => 1234,
+            'server' => array(
+                'host' => 'localhost'
+            ),
+        );
+        $expectedPersistentId = '1234';
+        $this->resourceManager->setResource($resourceId, $resource);
+
+        $this->assertNotSame($expectedPersistentId, $this->resourceManager->getPersistentId($resourceId));
+        $this->assertEmpty($this->resourceManager->getPersistentId($resourceId));
+    }
+}