@@ -138,7 +138,7 @@ |
||
138 | 138 | /** |
139 | 139 | * Fill fields to panel. |
140 | 140 | * |
141 | - * @param []Field $fields |
|
141 | + * @param Collection $fields |
|
142 | 142 | * |
143 | 143 | * @return $this |
144 | 144 | */ |
@@ -52,7 +52,7 @@ |
||
52 | 52 | /** |
53 | 53 | * Add a batch action. |
54 | 54 | * |
55 | - * @param $title |
|
55 | + * @param BatchDelete $title |
|
56 | 56 | * @param BatchAction|null $action |
57 | 57 | * |
58 | 58 | * @return $this |
@@ -55,7 +55,7 @@ |
||
55 | 55 | */ |
56 | 56 | public function condition() |
57 | 57 | { |
58 | - return $this->queries->map(function ($query) { |
|
58 | + return $this->queries->map(function($query) { |
|
59 | 59 | return [$query['method'] => $query['arguments']]; |
60 | 60 | })->toArray(); |
61 | 61 | } |
@@ -288,7 +288,7 @@ |
||
288 | 288 | return ''; |
289 | 289 | } |
290 | 290 | |
291 | - return $tools->map(function ($tool) { |
|
291 | + return $tools->map(function($tool) { |
|
292 | 292 | if ($tool instanceof Renderable) { |
293 | 293 | return $tool->render(); |
294 | 294 | } |
@@ -275,7 +275,7 @@ |
||
275 | 275 | */ |
276 | 276 | protected function renderCustomTools($tools) |
277 | 277 | { |
278 | - return $tools->map(function ($tool) { |
|
278 | + return $tools->map(function($tool) { |
|
279 | 279 | if ($tool instanceof Renderable) { |
280 | 280 | return $tool->render(); |
281 | 281 | } |
@@ -411,7 +411,7 @@ discard block |
||
411 | 411 | /** |
412 | 412 | * Resolve perPage for pagination. |
413 | 413 | * |
414 | - * @param array|null $paginate |
|
414 | + * @param Model $paginate |
|
415 | 415 | * |
416 | 416 | * @return array |
417 | 417 | */ |
@@ -441,7 +441,7 @@ discard block |
||
441 | 441 | /** |
442 | 442 | * Find query by method name. |
443 | 443 | * |
444 | - * @param $method |
|
444 | + * @param string $method |
|
445 | 445 | * |
446 | 446 | * @return static |
447 | 447 | */ |
@@ -534,7 +534,7 @@ discard block |
||
534 | 534 | * |
535 | 535 | * @throws \Exception |
536 | 536 | * |
537 | - * @return array |
|
537 | + * @return string[] |
|
538 | 538 | */ |
539 | 539 | protected function joinParameters(Relation $relation) |
540 | 540 | { |
@@ -311,9 +311,9 @@ discard block |
||
311 | 311 | |
312 | 312 | $this->setSort(); |
313 | 313 | |
314 | - $this->queries->reject(function ($query) { |
|
314 | + $this->queries->reject(function($query) { |
|
315 | 315 | return $query['method'] == 'paginate'; |
316 | - })->each(function ($query) { |
|
316 | + })->each(function($query) { |
|
317 | 317 | $this->model = $this->model->{$query['method']}(...$query['arguments']); |
318 | 318 | }); |
319 | 319 | |
@@ -364,7 +364,7 @@ discard block |
||
364 | 364 | $this->setSort(); |
365 | 365 | $this->setPaginate(); |
366 | 366 | |
367 | - $this->queries->unique()->each(function ($query) { |
|
367 | + $this->queries->unique()->each(function($query) { |
|
368 | 368 | $this->model = call_user_func_array([$this->model, $query['method']], $query['arguments']); |
369 | 369 | }); |
370 | 370 | |
@@ -394,9 +394,9 @@ discard block |
||
394 | 394 | |
395 | 395 | $queryBuilder = $this->originalModel; |
396 | 396 | |
397 | - $this->queries->reject(function ($query) { |
|
397 | + $this->queries->reject(function($query) { |
|
398 | 398 | return in_array($query['method'], ['get', 'paginate']); |
399 | - })->each(function ($query) use (&$queryBuilder) { |
|
399 | + })->each(function($query) use (&$queryBuilder) { |
|
400 | 400 | $queryBuilder = $queryBuilder->{$query['method']}(...$query['arguments']); |
401 | 401 | }); |
402 | 402 | |
@@ -430,7 +430,7 @@ discard block |
||
430 | 430 | { |
431 | 431 | $paginate = $this->findQueryByMethod('paginate'); |
432 | 432 | |
433 | - $this->queries = $this->queries->reject(function ($query) { |
|
433 | + $this->queries = $this->queries->reject(function($query) { |
|
434 | 434 | return $query['method'] == 'paginate'; |
435 | 435 | }); |
436 | 436 | |
@@ -488,7 +488,7 @@ discard block |
||
488 | 488 | */ |
489 | 489 | protected function findQueryByMethod($method) |
490 | 490 | { |
491 | - return $this->queries->first(function ($query) use ($method) { |
|
491 | + return $this->queries->first(function($query) use ($method) { |
|
492 | 492 | return $query['method'] == $method; |
493 | 493 | }); |
494 | 494 | } |
@@ -532,7 +532,7 @@ discard block |
||
532 | 532 | { |
533 | 533 | list($relationName, $relationColumn) = explode('.', $column); |
534 | 534 | |
535 | - if ($this->queries->contains(function ($query) use ($relationName) { |
|
535 | + if ($this->queries->contains(function($query) use ($relationName) { |
|
536 | 536 | return $query['method'] == 'with' && in_array($relationName, $query['arguments']); |
537 | 537 | })) { |
538 | 538 | $relation = $this->model->$relationName(); |
@@ -561,7 +561,7 @@ discard block |
||
561 | 561 | */ |
562 | 562 | public function resetOrderBy() |
563 | 563 | { |
564 | - $this->queries = $this->queries->reject(function ($query) { |
|
564 | + $this->queries = $this->queries->reject(function($query) { |
|
565 | 565 | return $query['method'] == 'orderBy' || $query['method'] == 'orderByDesc'; |
566 | 566 | }); |
567 | 567 | } |
@@ -23,7 +23,7 @@ |
||
23 | 23 | $columns = $titles; |
24 | 24 | } |
25 | 25 | |
26 | - $data = array_map(function ($item) use ($columns) { |
|
26 | + $data = array_map(function($item) use ($columns) { |
|
27 | 27 | $sorted = []; |
28 | 28 | |
29 | 29 | $arr = array_only($item, $columns); |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | * |
35 | 35 | * @param Request $request |
36 | 36 | * |
37 | - * @return mixed |
|
37 | + * @return \Illuminate\Http\RedirectResponse |
|
38 | 38 | */ |
39 | 39 | public function postLogin(Request $request) |
40 | 40 | { |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | /** |
63 | 63 | * User logout. |
64 | 64 | * |
65 | - * @return Redirect |
|
65 | + * @return \Illuminate\Http\RedirectResponse |
|
66 | 66 | */ |
67 | 67 | public function getLogout(Request $request) |
68 | 68 | { |
@@ -170,7 +170,7 @@ discard block |
||
170 | 170 | * |
171 | 171 | * @param \Illuminate\Http\Request $request |
172 | 172 | * |
173 | - * @return \Illuminate\Http\Response |
|
173 | + * @return \Illuminate\Http\RedirectResponse |
|
174 | 174 | */ |
175 | 175 | protected function sendLoginResponse(Request $request) |
176 | 176 | { |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | { |
84 | 84 | $form = $this->settingForm(); |
85 | 85 | $form->tools( |
86 | - function (Form\Tools $tools) { |
|
86 | + function(Form\Tools $tools) { |
|
87 | 87 | $tools->disableList(); |
88 | 88 | } |
89 | 89 | ); |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | $form->image('avatar', trans('admin.avatar')); |
119 | 119 | $form->password('password', trans('admin.password'))->rules('confirmed|required'); |
120 | 120 | $form->password('password_confirmation', trans('admin.password_confirmation'))->rules('required') |
121 | - ->default(function ($form) { |
|
121 | + ->default(function($form) { |
|
122 | 122 | return $form->model()->password; |
123 | 123 | }); |
124 | 124 | |
@@ -126,13 +126,13 @@ discard block |
||
126 | 126 | |
127 | 127 | $form->ignore(['password_confirmation']); |
128 | 128 | |
129 | - $form->saving(function (Form $form) { |
|
129 | + $form->saving(function(Form $form) { |
|
130 | 130 | if ($form->password && $form->model()->password != $form->password) { |
131 | 131 | $form->password = bcrypt($form->password); |
132 | 132 | } |
133 | 133 | }); |
134 | 134 | |
135 | - $form->saved(function () { |
|
135 | + $form->saved(function() { |
|
136 | 136 | admin_toastr(trans('admin.update_succeeded')); |
137 | 137 | |
138 | 138 | return redirect(admin_base_path('auth/setting')); |
@@ -87,14 +87,14 @@ discard block |
||
87 | 87 | $grid->created_at(trans('admin.created_at')); |
88 | 88 | $grid->updated_at(trans('admin.updated_at')); |
89 | 89 | |
90 | - $grid->actions(function (Grid\Displayers\Actions $actions) { |
|
90 | + $grid->actions(function(Grid\Displayers\Actions $actions) { |
|
91 | 91 | if ($actions->getKey() == 1) { |
92 | 92 | $actions->disableDelete(); |
93 | 93 | } |
94 | 94 | }); |
95 | 95 | |
96 | - $grid->tools(function (Grid\Tools $tools) { |
|
97 | - $tools->batch(function (Grid\Tools\BatchActions $actions) { |
|
96 | + $grid->tools(function(Grid\Tools $tools) { |
|
97 | + $tools->batch(function(Grid\Tools\BatchActions $actions) { |
|
98 | 98 | $actions->disableDelete(); |
99 | 99 | }); |
100 | 100 | }); |
@@ -115,10 +115,10 @@ discard block |
||
115 | 115 | $show->id('ID'); |
116 | 116 | $show->username(trans('admin.username')); |
117 | 117 | $show->name(trans('admin.name')); |
118 | - $show->roles(trans('admin.roles'))->as(function ($roles) { |
|
118 | + $show->roles(trans('admin.roles'))->as(function($roles) { |
|
119 | 119 | return $roles->pluck('name'); |
120 | 120 | })->label(); |
121 | - $show->permissions(trans('admin.permissions'))->as(function ($permission) { |
|
121 | + $show->permissions(trans('admin.permissions'))->as(function($permission) { |
|
122 | 122 | return $permission->pluck('name'); |
123 | 123 | })->label(); |
124 | 124 | $show->created_at(trans('admin.created_at')); |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | $form->image('avatar', trans('admin.avatar')); |
144 | 144 | $form->password('password', trans('admin.password'))->rules('required|confirmed'); |
145 | 145 | $form->password('password_confirmation', trans('admin.password_confirmation'))->rules('required') |
146 | - ->default(function ($form) { |
|
146 | + ->default(function($form) { |
|
147 | 147 | return $form->model()->password; |
148 | 148 | }); |
149 | 149 | |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | $form->display('created_at', trans('admin.created_at')); |
156 | 156 | $form->display('updated_at', trans('admin.updated_at')); |
157 | 157 | |
158 | - $form->saving(function (Form $form) { |
|
158 | + $form->saving(function(Form $form) { |
|
159 | 159 | if ($form->password && $form->model()->password != $form->password) { |
160 | 160 | $form->password = bcrypt($form->password); |
161 | 161 | } |