Call rewind() of the inner Iterator

lampager · Jan 2, 2020 · 04c57c2 · 04c57c2
1 parent 221a372
commit 04c57c2
Show file tree

Hide file tree

Showing 2 changed files with 76 additions and 8 deletions.
diff --git a/src/PaginationResult.php b/src/PaginationResult.php
@@ -78,7 +78,11 @@ public function next()
      */
     public function rewind()
     {
-        $this->iterator = $this->getIterator();
+        if (!$this->iterator) {
+            $this->iterator = $this->getIterator();
+        }
+
+        $this->iterator->rewind();
     }
 
     /**

diff --git a/tests/TestCase/PaginationResultTest.php b/tests/TestCase/PaginationResultTest.php
@@ -2,16 +2,20 @@
 
 namespace Lampager\Cake\Test\TestCase;
 
+use ArrayIterator;
 use Cake\I18n\Time;
 use Cake\ORM\Entity;
 use Lampager\Cake\PaginationResult;
+use Traversable;
 
 class PaginationResultTest extends TestCase
 {
     /**
+     * @param        array|Traversable $entities
+     * @param        mixed[]           $meta
      * @dataProvider resultProvider
      */
-    public function testIteratorCurrent(array $entities, array $meta)
+    public function testIteratorCurrent($entities, array $meta)
     {
         $actual = new PaginationResult($entities, $meta);
 
@@ -37,9 +41,11 @@ public function testIteratorCurrent(array $entities, array $meta)
     }
 
     /**
+     * @param        array|Traversable $entities
+     * @param        mixed[]           $meta
      * @dataProvider resultProvider
      */
-    public function testIteratorKey(array $entities, array $meta)
+    public function testIteratorKey($entities, array $meta)
     {
         $actual = new PaginationResult($entities, $meta);
 
@@ -65,9 +71,11 @@ public function testIteratorKey(array $entities, array $meta)
     }
 
     /**
+     * @param        array|Traversable $entities
+     * @param        mixed[]           $meta
      * @dataProvider resultProvider
      */
-    public function testIteratorNext(array $entities, array $meta)
+    public function testIteratorNext($entities, array $meta)
     {
         $actual = new PaginationResult($entities, $meta);
 
@@ -91,9 +99,11 @@ public function testIteratorNext(array $entities, array $meta)
     }
 
     /**
+     * @param        array|Traversable $entities
+     * @param        mixed[]           $meta
      * @dataProvider resultProvider
      */
-    public function testIteratorValid(array $entities, array $meta)
+    public function testIteratorValid($entities, array $meta)
     {
         $actual = new PaginationResult($entities, $meta);
 
@@ -121,18 +131,23 @@ public function testIteratorValid(array $entities, array $meta)
     }
 
     /**
+     * @param        array|Traversable $entities
+     * @param        mixed[]           $meta
+     * @param        string            $expected
      * @dataProvider resultProvider
      */
-    public function testJsonSerialize(array $entities, array $meta, $expected)
+    public function testJsonSerialize($entities, array $meta, $expected)
     {
         $actual = json_encode(new PaginationResult($entities, $meta));
         $this->assertJsonStringEqualsJsonString($expected, $actual);
     }
 
     /**
+     * @param        array|Traversable $entities
+     * @param        mixed[]           $meta
      * @dataProvider resultProvider
      */
-    public function testSerializeAndUnserialize(array $entities, array $meta)
+    public function testSerializeAndUnserialize($entities, array $meta)
     {
         $actual = unserialize(serialize(new PaginationResult($entities, $meta)));
         $expected = new PaginationResult($entities, $meta);
@@ -141,7 +156,7 @@ public function testSerializeAndUnserialize(array $entities, array $meta)
 
     public function resultProvider()
     {
-        yield [
+        yield 'Array iteration' => [
             [
                 new Entity([
                     'id' => 1,
@@ -189,5 +204,54 @@ public function resultProvider()
                 }
             }',
         ];
+
+        yield 'ArrayIterator iteration' => [
+            new ArrayIterator([
+                new Entity([
+                    'id' => 1,
+                    'modified' => new Time('2017-01-01 10:00:00'),
+                ]),
+                new Entity([
+                    'id' => 3,
+                    'modified' => new Time('2017-01-01 10:00:00'),
+                ]),
+                new Entity([
+                    'id' => 5,
+                    'modified' => new Time('2017-01-01 10:00:00'),
+                ]),
+            ]),
+            [
+                'hasPrevious' => null,
+                'previousCursor' => null,
+                'hasNext' => true,
+                'nextCursor' => [
+                    'Posts.id' => 2,
+                    'Posts.modified' => new Time('2017-01-01 11:00:00'),
+                ],
+            ],
+            '{
+                "records": [
+                    {
+                        "id": 1,
+                        "modified": "2017-01-01T10:00:00+00:00"
+                    },
+                    {
+                        "id": 3,
+                        "modified": "2017-01-01T10:00:00+00:00"
+                    },
+                    {
+                        "id": 5,
+                        "modified": "2017-01-01T10:00:00+00:00"
+                    }
+                ],
+                "hasPrevious": null,
+                "previousCursor": null,
+                "hasNext": true,
+                "nextCursor": {
+                    "Posts.id": 2,
+                    "Posts.modified": "2017-01-01T11:00:00+00:00"
+                }
+            }',
+        ];
     }
 }