Merge branch 'hotfix/3562' into develop

Forward port zendframework/zendframework#3562

src/Storage/Adapter/KeyListIterator.php

@@ -165,6 +165,6 @@ public function rewind()
      */
     public function count()
     {
-        return $this->count();
+        return $this->count;
     }
 }

test/Storage/Adapter/KeyListIteratorTest.php

@@ -0,0 +1,33 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Cache
+ */
+
+namespace ZendTest\Cache\Storage\Adapter;
+
+use Zend\Cache;
+use Zend\Cache\Storage\Adapter\Memory as MemoryStorage;
+use Zend\Cache\Storage\Adapter\KeyListIterator;
+
+/**
+ * @category   Zend
+ * @package    Zend_Cache
+ * @subpackage UnitTests
+ * @group      Zend_Cache
+ */
+class KeyListIteratorTest extends \PHPUnit_Framework_TestCase
+{
+
+    public function testCount()
+    {
+        $keys = array('key1', 'key2', 'key3');
+        $storage = $this->getMock('Zend\Cache\Storage\StorageInterface');
+        $iterator = new KeyListIterator($storage, $keys);
+        $this->assertEquals(3, $iterator->count());
+    }
+}