feat: add support for generic paginators (#1372)

larastan · Nov 4, 2022 · 42eb41b · 42eb41b
1 parent 112636d
commit 42eb41b
Show file tree

Hide file tree

Showing 9 changed files with 226 additions and 28 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - fix: Eloquent builder `whereRelation()` losing the TModelClass generic type by @mad-briller.
 - feat: updated return type of the Validator::safe and FormRequest::safe method by @jdjfisher
 - feat: Added stub for the DB::transaction method by @jdjfisher
+- feat: add support for generic paginators by @erikgaal
 
 ## [2.2.0] - 2022-08-31
 

diff --git a/stubs/BelongsToMany.stub b/stubs/BelongsToMany.stub
@@ -109,4 +109,37 @@ class BelongsToMany extends Relation
      * @phpstan-return \Traversable<int, TRelatedModel>
      */
     public function getResults();
+
+    /**
+     * Get a paginator for the "select" statement.
+     *
+     * @param  int|null  $perPage
+     * @param  array<int, mixed>  $columns
+     * @param  string  $pageName
+     * @param  int|null  $page
+     * @return \Illuminate\Pagination\LengthAwarePaginator<TRelatedModel>
+     */
+    public function paginate($perPage = null, $columns = ['*'], $pageName = 'page', $page = null);
+
+    /**
+     * Paginate the given query into a simple paginator.
+     *
+     * @param  int|null  $perPage
+     * @param  array<int, mixed>  $columns
+     * @param  string  $pageName
+     * @param  int|null  $page
+     * @return \Illuminate\Pagination\Paginator<TRelatedModel>
+     */
+    public function simplePaginate($perPage = null, $columns = ['*'], $pageName = 'page', $page = null);
+
+    /**
+     * Paginate the given query into a cursor paginator.
+     *
+     * @param  int|null  $perPage
+     * @param  array<int, mixed>  $columns
+     * @param  string  $cursorName
+     * @param  string|null  $cursor
+     * @return \Illuminate\Pagination\CursorPaginator<TRelatedModel>
+     */
+    public function cursorPaginate($perPage = null, $columns = ['*'], $cursorName = 'cursor', $cursor = null);
 }
diff --git a/stubs/Contracts/Pagination.stub b/stubs/Contracts/Pagination.stub
@@ -3,22 +3,31 @@
 namespace Illuminate\Contracts\Pagination;
 
 /**
- * @mixin \Illuminate\Support\Collection
- * @mixin \Illuminate\Pagination\Paginator
+ * @template TItem
  */
 interface Paginator
-{}
+{
+    /**
+     * @return array<TItem>
+     */
+    public function items(): array;
+}
 
 /**
- * @mixin \Illuminate\Support\Collection
- * @mixin \Illuminate\Pagination\LengthAwarePaginator
+ * @template TItem
+ *
+ * @extends Paginator<TItem>
  */
 interface LengthAwarePaginator extends Paginator
 {}
 
 /**
- * @mixin \Illuminate\Support\Collection
- * @mixin \Illuminate\Pagination\CursorPaginator
+ * @template TItem
  */
-interface CursorPaginator extends Paginator
-{}
+interface CursorPaginator
+{
+    /**
+     * @return array<TItem>
+     */
+    public function items(): array;
+}
diff --git a/stubs/EloquentBuilder.stub b/stubs/EloquentBuilder.stub
@@ -440,7 +440,7 @@ class Builder
      * @param  array<array-key, mixed>  $columns
      * @param  string  $pageName
      * @param  int|null  $page
-     * @return \Illuminate\Pagination\LengthAwarePaginator
+     * @return \Illuminate\Pagination\LengthAwarePaginator<TModelClass>
      *
      * @throws \InvalidArgumentException
      */
@@ -453,7 +453,7 @@ class Builder
      * @param  array<array-key, mixed>  $columns
      * @param  string  $pageName
      * @param  int|null  $page
-     * @return \Illuminate\Pagination\Paginator
+     * @return \Illuminate\Pagination\Paginator<TModelClass>
      */
     public function simplePaginate($perPage = null, $columns = ['*'], $pageName = 'page', $page = null);
 
@@ -464,7 +464,7 @@ class Builder
      * @param  array<array-key, mixed>  $columns
      * @param  string  $cursorName
      * @param  \Illuminate\Pagination\Cursor|string|null  $cursor
-     * @return \Illuminate\Pagination\CursorPaginator
+     * @return \Illuminate\Pagination\CursorPaginator<TModelClass>
      */
      public function cursorPaginate($perPage = null, $columns = ['*'], $cursorName = 'cursor', $cursor = null);
 

diff --git a/stubs/HasManyThrough.stub b/stubs/HasManyThrough.stub
@@ -14,4 +14,37 @@ class HasManyThrough extends Relation
      * @phpstan-return \Traversable<int, TRelatedModel>
      */
     public function getResults();
+
+    /**
+     * Get a paginator for the "select" statement.
+     *
+     * @param  int|null  $perPage
+     * @param  array<int, mixed>  $columns
+     * @param  string  $pageName
+     * @param  int|null  $page
+     * @return \Illuminate\Pagination\LengthAwarePaginator<TRelatedModel>
+     */
+    public function paginate($perPage = null, $columns = ['*'], $pageName = 'page', $page = null);
+
+    /**
+     * Paginate the given query into a simple paginator.
+     *
+     * @param  int|null  $perPage
+     * @param  array<int, mixed>  $columns
+     * @param  string  $pageName
+     * @param  int|null  $page
+     * @return \Illuminate\Pagination\Paginator<TRelatedModel>
+     */
+    public function simplePaginate($perPage = null, $columns = ['*'], $pageName = 'page', $page = null);
+
+    /**
+     * Paginate the given query into a cursor paginator.
+     *
+     * @param  int|null  $perPage
+     * @param  array<int, mixed>  $columns
+     * @param  string  $cursorName
+     * @param  string|null  $cursor
+     * @return \Illuminate\Pagination\CursorPaginator<TRelatedModel>
+     */
+    public function cursorPaginate($perPage = null, $columns = ['*'], $cursorName = 'cursor', $cursor = null);
 }
diff --git a/stubs/Pagination.stub b/stubs/Pagination.stub
@@ -3,33 +3,116 @@
 namespace Illuminate\Pagination;
 
 /**
- * @mixin \Illuminate\Support\Collection
+ * @template TValue
+ *
+ * @mixin \Illuminate\Support\Collection<mixed, TValue>
  */
 abstract class AbstractPaginator implements \Illuminate\Contracts\Support\Htmlable
-{}
+{
+    /**
+     * @return array<TValue>
+     */
+    public function items(): array;
+
+    /**
+     * @return \Illuminate\Support\Collection<array-key, TValue>
+     */
+    public function getCollection(): \Illuminate\Support\Collection;
+
+    /**
+     * @return \ArrayIterator<array-key, TValue>
+     */
+    public function getIterator(): \Traversable;
+
+    public function offsetExists(mixed $offset): bool;
+
+    /**
+     * @return TValue|null
+     */
+    public function offsetGet(mixed $offset): mixed;
+
+    /**
+     * @param TValue $value
+     */
+    public function offsetSet(mixed $offset, $value): void;
+
+    public function offsetUnset(mixed $offset): void;
+}
 
 /**
- * @implements \ArrayAccess<mixed, mixed>
- * @implements \IteratorAggregate<mixed, mixed>
- * @implements \Illuminate\Contracts\Support\Arrayable<array-key, mixed>
+ * @template TValue
+ *
+ * @implements \ArrayAccess<array-key, TValue>
+ * @implements \IteratorAggregate<array-key, TValue>
+ * @implements \Illuminate\Contracts\Support\Arrayable<array-key, TValue>
+ * @implements \Illuminate\Contracts\Pagination\Paginator<TValue>
+ *
+ * @extends AbstractPaginator<TValue>
  */
 class Paginator extends AbstractPaginator implements \Illuminate\Contracts\Support\Arrayable, \ArrayAccess, \Countable, \IteratorAggregate, \Illuminate\Contracts\Support\Jsonable, \JsonSerializable, \Illuminate\Contracts\Pagination\Paginator
 {}
 
 /**
- * @implements \ArrayAccess<mixed, mixed>
- * @implements \IteratorAggregate<mixed, mixed>
- * @implements \Illuminate\Contracts\Support\Arrayable<array-key, mixed>
+ * @template TValue
+ *
+ * @implements \ArrayAccess<array-key, TValue>
+ * @implements \IteratorAggregate<array-key, TValue>
+ * @implements \Illuminate\Contracts\Support\Arrayable<array-key, TValue>
+ * @implements \Illuminate\Contracts\Pagination\LengthAwarePaginator<TValue>
+ *
+ * @extends AbstractPaginator<TValue>
  */
 class LengthAwarePaginator extends AbstractPaginator implements \Illuminate\Contracts\Support\Arrayable, \ArrayAccess, \Countable, \IteratorAggregate, \Illuminate\Contracts\Support\Jsonable, \JsonSerializable, \Illuminate\Contracts\Pagination\LengthAwarePaginator
 {}
 
 /**
- * @implements \ArrayAccess<mixed, mixed>
- * @implements \IteratorAggregate<mixed, mixed>
- * @implements \Illuminate\Contracts\Support\Arrayable<array-key, mixed>
+ * @template TValue
+ *
+ * @mixin \Illuminate\Support\Collection<mixed, TValue>
+ */
+abstract class AbstractCursorPaginator implements \Illuminate\Contracts\Support\Htmlable
+{
+    /**
+     * @return array<TValue>
+     */
+    public function items(): array;
+
+    /**
+     * @return \Illuminate\Support\Collection<array-key, TValue>
+     */
+    public function getCollection(): \Illuminate\Support\Collection;
+
+    /**
+     * @return \ArrayIterator<array-key, TValue>
+     */
+    public function getIterator(): \Traversable;
+
+    public function offsetExists(mixed $offset): bool;
+
+    /**
+     * @return TValue|null
+     */
+    public function offsetGet(mixed $offset): mixed;
+
+    /**
+     * @param TValue $value
+     */
+    public function offsetSet(mixed $offset, $value): void;
+
+    public function offsetUnset(mixed $offset): void;
+}
+
+/**
+ * @template TValue
+ *
+ * @implements \ArrayAccess<array-key, TValue>
+ * @implements \IteratorAggregate<array-key, TValue>
+ * @implements \Illuminate\Contracts\Support\Arrayable<array-key, TValue>
+ * @implements \Illuminate\Contracts\Pagination\CursorPaginator<TValue>
+ *
+ * @extends AbstractCursorPaginator<TValue>
  */
-class CursorPaginator extends AbstractPaginator implements \Illuminate\Contracts\Support\Arrayable, \ArrayAccess, \Countable, \IteratorAggregate, \Illuminate\Contracts\Support\Jsonable, \JsonSerializable, \Illuminate\Contracts\Pagination\CursorPaginator
+class CursorPaginator extends AbstractCursorPaginator implements \Illuminate\Contracts\Support\Arrayable, \ArrayAccess, \Countable, \IteratorAggregate, \Illuminate\Contracts\Support\Jsonable, \JsonSerializable, \Illuminate\Contracts\Pagination\CursorPaginator
 {}
 
 /**

diff --git a/tests/Features/Methods/Builder.php b/tests/Features/Methods/Builder.php
@@ -9,6 +9,7 @@
 use App\User;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Database\Query\Builder as QueryBuilder;
+use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
 use function PHPStan\Testing\assertType;
 
@@ -345,4 +346,20 @@ public function testQueryBuilderOnEloquentBuilderWithBaseModel(EloquentBuilder $
     {
         assertType('Illuminate\Database\Eloquent\Builder<Illuminate\Database\Eloquent\Model>', $query->select());
     }
+
+    /**
+     * @phpstan-return LengthAwarePaginator<User>
+     */
+    public function testPaginate()
+    {
+        return User::query()->paginate();
+    }
+
+    /**
+     * @phpstan-return array<User>
+     */
+    public function testPaginateItems()
+    {
+        return User::query()->paginate()->items();
+    }
 }
diff --git a/tests/Features/Models/Relations.php b/tests/Features/Models/Relations.php
@@ -9,7 +9,6 @@
 use App\Post;
 use App\Role;
 use App\User;
-use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
@@ -19,6 +18,7 @@
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\Eloquent\Relations\MorphToMany;
+use Illuminate\Pagination\LengthAwarePaginator;
 use function PHPStan\Testing\assertType;
 
 class Relations
@@ -86,6 +86,9 @@ public function testDecrementWithAmountOnRelation(User $user): int
         return $user->accounts()->decrement('id', 5);
     }
 
+    /**
+     * @return LengthAwarePaginator<Account>
+     */
     public function testPaginate(User $user): LengthAwarePaginator
     {
         return $user->accounts()->paginate(5);

diff --git a/tests/Type/data/paginator-extension.php b/tests/Type/data/paginator-extension.php
@@ -7,6 +7,25 @@
 use App\User;
 use function PHPStan\Testing\assertType;
 
-assertType('array', User::paginate()->all());
-assertType('array', User::simplePaginate()->all());
-assertType('array', User::cursorPaginate()->all());
+assertType('Illuminate\Pagination\LengthAwarePaginator<App\User>', User::paginate());
+assertType('array<App\User>', User::paginate()->all());
+assertType('array<App\User>', User::paginate()->items());
+assertType('App\User|null', User::paginate()[0]);
+
+assertType('Illuminate\Pagination\Paginator<App\User>', User::simplePaginate());
+assertType('array<App\User>', User::simplePaginate()->all());
+assertType('array<App\User>', User::simplePaginate()->items());
+assertType('App\User|null', User::simplePaginate()[0]);
+
+assertType('Illuminate\Pagination\CursorPaginator<App\User>', User::cursorPaginate());
+assertType('array<App\User>', User::cursorPaginate()->all());
+assertType('array<App\User>', User::cursorPaginate()->items());
+assertType('App\User|null', User::cursorPaginate()[0]);
+
+assertType('ArrayIterator<(int|string), App\User>', User::query()->paginate()->getIterator());
+
+// HasMany
+assertType('Illuminate\Pagination\LengthAwarePaginator<App\Account>', (new User())->accounts()->paginate());
+
+// BelongsToMany
+assertType('Illuminate\Pagination\LengthAwarePaginator<App\Post>', (new User())->posts()->paginate());