From 77f66ed32db59b7cac53f22c841f84fb2c724c4e Mon Sep 17 00:00:00 2001
From: Caleb White <cdwhite3@pm.me>
Date: Thu, 13 Feb 2025 11:46:43 -0600
Subject: [PATCH] fix: pagination generics

---
 src/Illuminate/Pagination/AbstractCursorPaginator.php | 11 ++++++++---
 src/Illuminate/Pagination/AbstractPaginator.php       |  2 +-
 src/Illuminate/Pagination/Cursor.php                  |  1 +
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/Illuminate/Pagination/AbstractCursorPaginator.php b/src/Illuminate/Pagination/AbstractCursorPaginator.php
index af82cc07198b..87a087983aad 100644
--- a/src/Illuminate/Pagination/AbstractCursorPaginator.php
+++ b/src/Illuminate/Pagination/AbstractCursorPaginator.php
@@ -568,7 +568,7 @@ public function count(): int
     /**
      * Get the paginator's underlying collection.
      *
-     * @return \Illuminate\Support\Collection
+     * @return \Illuminate\Support\Collection<TKey, TValue>
      */
     public function getCollection()
     {
@@ -578,8 +578,13 @@ public function getCollection()
     /**
      * Set the paginator's underlying collection.
      *
-     * @param  \Illuminate\Support\Collection  $collection
+     * @template TSetKey of array-key
+     * @template TSetValue
+     *
+     * @param  \Illuminate\Support\Collection<TSetKey, TSetValue>  $collection
      * @return $this
+     *
+     * @phpstan-this-out static<TSetKey, TSetValue>
      */
     public function setCollection(Collection $collection)
     {
@@ -613,7 +618,7 @@ public function offsetExists($key): bool
      * Get the item at the given offset.
      *
      * @param  TKey  $key
-     * @return TValue
+     * @return TValue|null
      */
     public function offsetGet($key): mixed
     {
diff --git a/src/Illuminate/Pagination/AbstractPaginator.php b/src/Illuminate/Pagination/AbstractPaginator.php
index c746f93d86cc..dc6c9d0adc25 100644
--- a/src/Illuminate/Pagination/AbstractPaginator.php
+++ b/src/Illuminate/Pagination/AbstractPaginator.php
@@ -738,7 +738,7 @@ public function offsetExists($key): bool
      * Get the item at the given offset.
      *
      * @param  TKey  $key
-     * @return TValue
+     * @return TValue|null
      */
     public function offsetGet($key): mixed
     {
diff --git a/src/Illuminate/Pagination/Cursor.php b/src/Illuminate/Pagination/Cursor.php
index f45d90e9d5b7..73e5cd4e3a56 100644
--- a/src/Illuminate/Pagination/Cursor.php
+++ b/src/Illuminate/Pagination/Cursor.php
@@ -6,6 +6,7 @@
 use Illuminate\Support\Collection;
 use UnexpectedValueException;
 
+/** @implements Arrayable<array-key, mixed> */
 class Cursor implements Arrayable
 {
     /**