reverted the iterator to array convertion in the ->getCurrentPageResu…

…lts() method
lyrixx · Dec 15, 2011 · a061ad2 · a061ad2
1 parent 94bd483
commit a061ad2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 51 deletions.
diff --git a/src/Pagerfanta/Pagerfanta.php b/src/Pagerfanta/Pagerfanta.php
@@ -32,7 +32,7 @@ class Pagerfanta implements PagerfantaInterface
     private $maxPerPage;
     private $currentPage;
     private $nbResults;
-    private $slice;
+    private $currentPageResults;
     private $nbPages;
 
     /**
@@ -82,7 +82,7 @@ public function setMaxPerPage($maxPerPage)
             throw new LessThan1MaxPerPageException();
         }
 
-        $this->slice = null;
+        $this->currentPageResults = null;
         $this->nbPages = null;
         $this->maxPerPage = $maxPerPage;
 
@@ -130,7 +130,7 @@ public function setCurrentPage($currentPage, $allowOutOfRangePages = false, $nor
             }
         }
 
-        $this->slice = null;
+        $this->currentPageResults = null;
         $this->currentPage = $currentPage;
 
         return $this;
@@ -149,13 +149,13 @@ public function getCurrentPage()
      */
     public function getCurrentPageResults()
     {
-        $this->fetchSlice();
-
-        if ($this->slice instanceof \Iterator || $this->slice instanceof \IteratorAggregate) {
-            return iterator_to_array($this->slice);
+        if (null === $this->currentPageResults) {
+            $offset = ($this->getCurrentPage() - 1) * $this->getMaxPerPage();
+            $length = $this->getMaxPerPage();
+            $this->currentPageResults = $this->adapter->getSlice($offset, $length);
         }
 
-        return $this->slice;
+        return $this->currentPageResults;
     }
 
     /**
@@ -251,25 +251,16 @@ public function count()
      */
     public function getIterator()
     {
-        $this->fetchSlice();
+        $currentPageResults = $this->getCurrentPageResults();
 
-        if ($this->slice instanceof \Iterator) {
-            return $this->slice;
+        if ($currentPageResults instanceof \Iterator) {
+            return $currentPageResults;
         }
 
-        if ($this->slice instanceof \IteratorAggregate) {
-            return $this->slice->getIterator();
+        if ($currentPageResults instanceof \IteratorAggregate) {
+            return $currentPageResults->getIterator();
         }
 
-        return new \ArrayIterator($this->slice);
-    }
-
-    private function fetchSlice()
-    {
-        if (null === $this->slice) {
-            $offset = ($this->getCurrentPage() - 1) * $this->getMaxPerPage();
-            $length = $this->getMaxPerPage();
-            $this->slice = $this->adapter->getSlice($offset, $length);
-        }
+        return new \ArrayIterator($currentPageResults);
     }
 }
diff --git a/src/Pagerfanta/PagerfantaInterface.php b/src/Pagerfanta/PagerfantaInterface.php
@@ -70,7 +70,7 @@ function getCurrentPage();
     /**
      * Returns the results for the current page.
      *
-     * @return array The results.
+     * @return array|\Traversable The results.
      *
      * @api
      */

diff --git a/tests/Pagerfanta/Tests/PagerfantaTest.php b/tests/Pagerfanta/Tests/PagerfantaTest.php
@@ -191,33 +191,6 @@ public function testGetCurrentPageResults()
         $this->assertSame($returnValues[0], $this->pagerfanta->getCurrentPageResults());
     }
 
-    public function testGetCurrentPageResultsIteratorToArray()
-    {
-        $array = array('foo', 'bar', 'ups');
-        $iterator = new \ArrayIterator($array);
-
-        $this->adapter
-            ->expects($this->once())
-            ->method('getSlice')
-            ->will($this->returnValue($iterator))
-        ;
-
-        $this->assertSame($array, $this->pagerfanta->getCurrentPageResults());
-    }
-
-    public function testGetCurrentPageResultsIteratorAggregateToArray()
-    {
-        $iteratorAggregate = new IteratorAggregate();
-
-        $this->adapter
-            ->expects($this->once())
-            ->method('getSlice')
-            ->will($this->returnValue($iteratorAggregate))
-        ;
-
-        $this->assertSame(iterator_to_array($iteratorAggregate), $this->pagerfanta->getCurrentPageResults());
-    }
-
     public function testGetNbResults()
     {
         $this->adapter