@@ -60,13 +60,19 @@ protected function registerMacro()
60
60
$ size = $ maxResults ;
61
61
}
62
62
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 .'] ' )
69
74
->appends (Arr::except (request ()->input (), $ paginationParameter .'. ' .$ numberParameter ));
75
+ }
70
76
71
77
if (! is_null (config ('json-api-paginate.base_url ' ))) {
72
78
$ paginator ->setPath (config ('json-api-paginate.base_url ' ));
0 commit comments