Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[8.x] Fix issue with cursor pagination and Json resources #38026

Merged
merged 1 commit into from
Jul 15, 2021
+5 −0
Merged

[8.x] Fix issue with cursor pagination and Json resources #38026

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Fix issue with cursor pagination and Json resources
@driesvints
driesvints committed Jul 15, 2021

Verified

This commit was signed with the committer’s verified signature.
driesvints Dries Vints
GPG key ID: E1529B3ACC4A5A76
Verified
Learn about vigilant mode
commit d3c0bdfd99c8cc266d1807066635ac74a116a544
5 changes: 5 additions & 0 deletions src/Illuminate/Pagination/AbstractCursorPaginator.php
View file
Original file line number Diff line number Diff line change
@@ -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;