make getCount compatible with new Traversable return type of getIterator

thephpleague · Dec 13, 2024 · 2240019 · 2240019
1 parent 7f16489
commit 2240019
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/Pagination/DoctrinePaginatorAdapter.php b/src/Pagination/DoctrinePaginatorAdapter.php
@@ -73,7 +73,11 @@ public function getTotal(): int
      */
     public function getCount(): int
     {
-        return $this->paginator->count();
+        $iterator = $this->paginator->getIterator();
+
+        return (is_countable($iterator))
+            ? count($iterator)
+            : iterator_count($iterator);
     }
 
     /**

diff --git a/test/Pagination/DoctrinePaginatorAdapterTest.php b/test/Pagination/DoctrinePaginatorAdapterTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace League\Fractal\Test\Pagination;
 
-use Doctrine\ORM\Query;
+use ArrayIterator;
 use League\Fractal\Pagination\DoctrinePaginatorAdapter;
 use Mockery;
 use PHPUnit\Framework\TestCase;
@@ -28,11 +28,9 @@ public function testPaginationAdapter()
         $paginator->shouldReceive('getQuery')->andReturn($query);
 
         //Mock the iterator of the paginator
-        $iterator = Mockery::mock('IteratorAggregate');
-        $iterator->shouldReceive('count')->andReturn($count);
+        $iterator = new ArrayIterator(range(1, $count));
         $paginator->shouldReceive('getIterator')->andReturn($iterator);
 
-
         $adapter = new DoctrinePaginatorAdapter($paginator, function ($page) {
             return 'http://example.com/foo?page='.$page;
         });