@@ -134,7 +134,7 @@ |
||
134 | 134 | * |
135 | 135 | * @param string $key |
136 | 136 | * @param $default |
137 | - * @return mixed |
|
137 | + * @return integer |
|
138 | 138 | */ |
139 | 139 | public function getValue($key, $default = null) |
140 | 140 | { |
@@ -38,11 +38,11 @@ |
||
38 | 38 | |
39 | 39 | protected function loadInput() |
40 | 40 | { |
41 | - if (version_compare(App::version(), '6.0', '>=')) { |
|
41 | + if (version_compare(App::version(), '6.0', '>=')) { |
|
42 | 42 | $this->input = \Illuminate\Support\Facades\Request::input($this->getKey(), []); |
43 | - } else { |
|
43 | + } else { |
|
44 | 44 | $this->input = \Illuminate\Support\Facades\Input::get($this->getKey(), []); |
45 | - } |
|
45 | + } |
|
46 | 46 | } |
47 | 47 | |
48 | 48 | /** |
@@ -24,11 +24,11 @@ |
||
24 | 24 | protected function setupPaginationForReading() |
25 | 25 | { |
26 | 26 | Paginator::currentPageResolver(function () { |
27 | - if (version_compare(App::version(), '6.0', '>=')) { |
|
27 | + if (version_compare(App::version(), '6.0', '>=')) { |
|
28 | 28 | return \Illuminate\Support\Facades\Request::input("$this->input_key.page", 1); |
29 | - } else { |
|
29 | + } else { |
|
30 | 30 | return \Illuminate\Support\Facades\Input::get("$this->input_key.page", 1); |
31 | - } |
|
31 | + } |
|
32 | 32 | }); |
33 | 33 | } |
34 | 34 |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | |
24 | 24 | protected function setupPaginationForReading() |
25 | 25 | { |
26 | - Paginator::currentPageResolver(function () { |
|
26 | + Paginator::currentPageResolver(function() { |
|
27 | 27 | if (version_compare(App::version(), '6.0', '>=')) { |
28 | 28 | return \Illuminate\Support\Facades\Request::input("$this->input_key.page", 1); |
29 | 29 | } else { |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | if (isset($input['page'])) { |
55 | 55 | unset($input['page']); |
56 | 56 | } |
57 | - return str_replace('/?', '?',$paginator->appends($this->input_key, $input)->render()); |
|
57 | + return str_replace('/?', '?', $paginator->appends($this->input_key, $input)->render()); |
|
58 | 58 | } |
59 | 59 | |
60 | 60 | public function initialize(Grid $grid) |