Support iterable type fully in newer pagerfanta versions

Author: KorvinSzanto

src/Pagination/DoctrinePaginatorAdapter.php

@@ -19,7 +19,7 @@
  */
 class DoctrinePaginatorAdapter implements PaginatorInterface
 {
-    use TraversableCountTrait;
+    use PaginatorCountTrait;
 
     /**
      * The paginator instance.

src/Pagination/PagerfantaPaginatorAdapter.php

@@ -20,6 +20,8 @@
  */
 class PagerfantaPaginatorAdapter implements PaginatorInterface
 {
+    use PaginatorCountTrait;
+
     protected Pagerfanta $paginator;
 
     /**
@@ -64,7 +66,7 @@ public function getTotal(): int
      */
     public function getCount(): int
     {
-        return count($this->paginator->getCurrentPageResults());
+        return $this->getIterableCount($this->paginator->getCurrentPageResults());
     }
 
     /**

src/Pagination/TraversableCountTrait.php renamed to src/Pagination/PaginatorCountTrait.php

@@ -2,8 +2,20 @@
 
 namespace League\Fractal\Pagination;
 
-trait TraversableCountTrait
+trait PaginatorCountTrait
 {
+    /**
+     * Safely get the count from an iterable
+     */
+    private function getIterableCount(iterable $iterable): int
+    {
+        if ($iterable instanceof \Traversable) {
+            return $this->getTraversableCount($iterable);
+        }
+
+        return count($iterable);
+    }
+
     /**
      * Safely get the count from a traversable
      */

test/Pagination/PaginatorCountTraitTest.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace League\Fractal\Test\Pagination;
+
+use League\Fractal\Pagination\PaginatorCountTrait;
+use League\Fractal\Test\Stub\SimpleTraversable;
+use PHPUnit\Framework\TestCase;
+
+class PaginatorCountTraitTest extends TestCase
+{
+    protected $instance;
+
+    /** @before */
+    public function before()
+    {
+        $this->instance = new class() {
+            use PaginatorCountTrait;
+
+            public function getIterableCountPublic(iterable $iterable)
+            {
+                return $this->getIterableCount($iterable);
+            }
+
+            public function getTraversableCountPublic(\Traversable $traversable)
+            {
+                return $this->getTraversableCount($traversable);
+            }
+        };
+    }
+
+    /**
+     * @dataProvider arrayProvider
+     */
+    public function testSupportsIterables(array $data)
+    {
+        $count = count($data);
+        $this->assertEquals($count, $this->instance->getIterableCountPublic($data));
+        $this->assertEquals($count, $this->instance->getIterableCountPublic(new \ArrayIterator($data)));
+        $this->assertEquals($count, $this->instance->getIterableCountPublic(new SimpleTraversable($data)));
+    }
+
+    /**
+     * @dataProvider arrayProvider
+     */
+    public function testSupportsTraversables(array $data)
+    {
+        $count = count($data);
+        $this->assertEquals($count, $this->instance->getTraversableCountPublic(new \ArrayIterator($data)));
+        $this->assertEquals($count, $this->instance->getTraversableCountPublic(new SimpleTraversable($data)));
+    }
+
+    public function arrayProvider()
+    {
+        return [
+            [[]],
+            [[1, 2, 3]],
+            [range(1, 100)],
+        ];
+    }
+}