Skip to content

Commit 98ba20b

Browse files
authored
Merge pull request #82 from sebj54/patch-1
Fix compatibility with Laravel < 11
2 parents 1c1d506 + 34deeb4 commit 98ba20b

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

src/JsonApiPaginateServiceProvider.php

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,19 @@ protected function registerMacro()
6060
$size = $maxResults;
6161
}
6262

63-
$paginator = $paginationMethod === 'cursorPaginate'
64-
? $this->{$paginationMethod}($size, ['*'], $paginationParameter.'['.$cursorParameter.']', $cursor)
65-
->appends(Arr::except(request()->input(), $paginationParameter.'.'.$cursorParameter))
66-
: $this
67-
->{$paginationMethod}($size, ['*'], $paginationParameter.'.'.$numberParameter, null, $totalResults)
68-
->setPageName($paginationParameter.'['.$numberParameter.']')
63+
if ($paginationMethod === 'cursorPaginate') {
64+
$paginator = $this->{$paginationMethod}($size, ['*'], $paginationParameter.'['.$cursorParameter.']', $cursor)
65+
->appends(Arr::except(request()->input(), $paginationParameter.'.'.$cursorParameter));
66+
} else {
67+
if (version_compare(app()->version(), '11.0.0') >= 0) {
68+
$paginator = $this->{$paginationMethod}($size, ['*'], $paginationParameter.'.'.$numberParameter, null, $totalResults);
69+
} else {
70+
$paginator = $this->{$paginationMethod}($size, ['*'], $paginationParameter.'.'.$numberParameter);
71+
}
72+
73+
$paginator->setPageName($paginationParameter.'['.$numberParameter.']')
6974
->appends(Arr::except(request()->input(), $paginationParameter.'.'.$numberParameter));
75+
}
7076

7177
if (! is_null(config('json-api-paginate.base_url'))) {
7278
$paginator->setPath(config('json-api-paginate.base_url'));

0 commit comments

Comments
 (0)