Merge branch 'hotfix/26'

Close #26
Fixes #22

CHANGELOG.md

@@ -35,7 +35,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#26](https://github.com/zendframework/zend-paginator/pull/26) fixes an issue
+  in `Paginator::count()` whereby it would re-count when zero pages had been
+  previously detected.
 
 ## 2.7.0 - 2016-04-11
 

src/Paginator.php

@@ -339,7 +339,7 @@ public function setCacheEnabled($enable)
      */
     public function count()
     {
-        if (! $this->pageCount) {
+        if ($this->pageCount === null) {
             $this->pageCount = $this->_calculatePageCount();
         }
 

test/PaginatorTest.php

@@ -154,6 +154,23 @@ public function testHasCorrectCountOfAllItemsAfterInit()
         $this->assertEquals(101, $paginator->getTotalItemCount());
     }
 
+    public function testRepetitiveCallOfCountResultsOfZero()
+    {
+        $count = 0;
+
+        $paginator = $this->getMockBuilder(Paginator\Paginator::class)
+            ->setConstructorArgs([new Adapter\ArrayAdapter([])])
+            ->setMethods(['_calculatePageCount'])
+            ->getMock();
+
+        $paginator->expects($this->once())
+            ->method('_calculatePageCount')
+            ->willReturn($count);
+
+        $this->assertEquals($count, $paginator->count());
+        $this->assertEquals($count, $paginator->count());
+    }
+
     public function testLoadsFromConfig()
     {
         Paginator\Paginator::setGlobalConfig($this->config->testing);