From d3c0bdfd99c8cc266d1807066635ac74a116a544 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Thu, 15 Jul 2021 20:55:04 +0200 Subject: [PATCH] Fix issue with cursor pagination and Json resources --- src/Illuminate/Pagination/AbstractCursorPaginator.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Illuminate/Pagination/AbstractCursorPaginator.php b/src/Illuminate/Pagination/AbstractCursorPaginator.php index e65c0cb12e14..9644f66036b0 100644 --- a/src/Illuminate/Pagination/AbstractCursorPaginator.php +++ b/src/Illuminate/Pagination/AbstractCursorPaginator.php @@ -8,6 +8,7 @@ use Illuminate\Contracts\Support\Htmlable; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\Pivot; +use Illuminate\Http\Resources\Json\JsonResource; use Illuminate\Support\Arr; use Illuminate\Support\Collection; use Illuminate\Support\Str; @@ -197,6 +198,10 @@ public function getParametersForItem($item) return collect($this->parameters) ->flip() ->map(function ($_, $parameterName) use ($item) { + if ($item instanceof JsonResource) { + $item = $item->resource; + } + if ($item instanceof Model && ! is_null($parameter = $this->getPivotParameterForItem($item, $parameterName))) { return $parameter;