|
@@ -26,7 +26,7 @@ discard block |
|
|
block discarded – undo |
|
26
|
26
|
|
|
27
|
27
|
protected function registerMacro() |
|
28
|
28
|
{ |
|
29
|
|
- Builder::macro(config('json-api-paginate.method_name'), function (int $maxResults = null, int $defaultSize = null) { |
|
|
29
|
+ Builder::macro(config('json-api-paginate.method_name'), function(int $maxResults = null, int $defaultSize = null) { |
|
30
|
30
|
$maxResults = $maxResults ?? config('json-api-paginate.max_results'); |
|
31
|
31
|
$defaultSize = $defaultSize ?? config('json-api-paginate.default_size'); |
|
32
|
32
|
$numberParameter = config('json-api-paginate.number_parameter'); |
|
@@ -38,11 +38,11 @@ discard block |
|
|
block discarded – undo |
|
38
|
38
|
$size = $size > $maxResults ? $maxResults : $size; |
|
39
|
39
|
|
|
40
|
40
|
$paginator = $this |
|
41
|
|
- ->paginate($size, ['*'], $paginationParameter.'.'.$numberParameter) |
|
|
41
|
+ ->paginate($size, [ '*' ], $paginationParameter.'.'.$numberParameter) |
|
42
|
42
|
->setPageName($paginationParameter.'['.$numberParameter.']') |
|
43
|
43
|
->appends(Arr::except(request()->input(), $paginationParameter.'.'.$numberParameter)); |
|
44
|
44
|
|
|
45
|
|
- if (! is_null(config('json-api-paginate.base_url'))) { |
|
|
45
|
+ if (!is_null(config('json-api-paginate.base_url'))) { |
|
46
|
46
|
$paginator->setPath(config('json-api-paginate.base_url')); |
|
47
|
47
|
} |
|
48
|
48
|
|
Please login to merge, or discard this patch.
spatie /
laravel-json-api-paginate
