@@ -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); |
@@ -292,9 +292,9 @@ discard block |
||
292 | 292 | $data = $this->model->with($this->getRelations()) |
293 | 293 | ->findOrFail($id)->toArray(); |
294 | 294 | |
295 | - $this->builder->fields()->filter(function ($field) { |
|
295 | + $this->builder->fields()->filter(function($field) { |
|
296 | 296 | return $field instanceof Field\File; |
297 | - })->each(function (Field\File $file) use ($data) { |
|
297 | + })->each(function(Field\File $file) use ($data) { |
|
298 | 298 | $file->setOriginal($data); |
299 | 299 | |
300 | 300 | $file->destroy(); |
@@ -319,7 +319,7 @@ discard block |
||
319 | 319 | return $response; |
320 | 320 | } |
321 | 321 | |
322 | - DB::transaction(function () { |
|
322 | + DB::transaction(function() { |
|
323 | 323 | $inserts = $this->prepareInsert($this->updates); |
324 | 324 | |
325 | 325 | foreach ($inserts as $column => $value) { |
@@ -506,7 +506,7 @@ discard block |
||
506 | 506 | return $response; |
507 | 507 | } |
508 | 508 | |
509 | - DB::transaction(function () { |
|
509 | + DB::transaction(function() { |
|
510 | 510 | $updates = $this->prepareUpdate($this->updates); |
511 | 511 | |
512 | 512 | foreach ($updates as $column => $value) { |
@@ -939,7 +939,7 @@ discard block |
||
939 | 939 | protected function getFieldByColumn($column) |
940 | 940 | { |
941 | 941 | return $this->builder->fields()->first( |
942 | - function (Field $field) use ($column) { |
|
942 | + function(Field $field) use ($column) { |
|
943 | 943 | if (is_array($field->column())) { |
944 | 944 | return in_array($column, $field->column()); |
945 | 945 | } |
@@ -960,7 +960,7 @@ discard block |
||
960 | 960 | |
961 | 961 | $values = $this->model->toArray(); |
962 | 962 | |
963 | - $this->builder->fields()->each(function (Field $field) use ($values) { |
|
963 | + $this->builder->fields()->each(function(Field $field) use ($values) { |
|
964 | 964 | $field->setOriginal($values); |
965 | 965 | }); |
966 | 966 | } |
@@ -982,7 +982,7 @@ discard block |
||
982 | 982 | |
983 | 983 | $data = $this->model->toArray(); |
984 | 984 | |
985 | - $this->builder->fields()->each(function (Field $field) use ($data) { |
|
985 | + $this->builder->fields()->each(function(Field $field) use ($data) { |
|
986 | 986 | if (!in_array($field->column(), $this->ignored)) { |
987 | 987 | $field->fill($data); |
988 | 988 | } |
@@ -1105,7 +1105,7 @@ discard block |
||
1105 | 1105 | */ |
1106 | 1106 | public function setWidth($fieldWidth = 8, $labelWidth = 2) |
1107 | 1107 | { |
1108 | - $this->builder()->fields()->each(function ($field) use ($fieldWidth, $labelWidth) { |
|
1108 | + $this->builder()->fields()->each(function($field) use ($fieldWidth, $labelWidth) { |
|
1109 | 1109 | /* @var Field $field */ |
1110 | 1110 | $field->setWidth($fieldWidth, $labelWidth); |
1111 | 1111 | }); |
@@ -265,7 +265,7 @@ discard block |
||
265 | 265 | * |
266 | 266 | * @param $id |
267 | 267 | * |
268 | - * @return mixed |
|
268 | + * @return boolean |
|
269 | 269 | */ |
270 | 270 | public function destroy($id) |
271 | 271 | { |
@@ -369,7 +369,7 @@ discard block |
||
369 | 369 | * |
370 | 370 | * @param array $data |
371 | 371 | * |
372 | - * @return mixed |
|
372 | + * @return Response|null |
|
373 | 373 | */ |
374 | 374 | protected function prepare($data = []) |
375 | 375 | { |
@@ -547,7 +547,7 @@ discard block |
||
547 | 547 | /** |
548 | 548 | * Get RedirectResponse after update. |
549 | 549 | * |
550 | - * @param mixed $key |
|
550 | + * @param integer $key |
|
551 | 551 | * |
552 | 552 | * @return \Illuminate\Http\RedirectResponse |
553 | 553 | */ |
@@ -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 | } |
@@ -27,10 +27,10 @@ discard block |
||
27 | 27 | return $content |
28 | 28 | ->header(trans('admin.menu')) |
29 | 29 | ->description(trans('admin.list')) |
30 | - ->row(function (Row $row) { |
|
30 | + ->row(function(Row $row) { |
|
31 | 31 | $row->column(6, $this->treeView()->render()); |
32 | 32 | |
33 | - $row->column(6, function (Column $column) { |
|
33 | + $row->column(6, function(Column $column) { |
|
34 | 34 | $form = new \Encore\Admin\Widgets\Form(); |
35 | 35 | $form->action(admin_base_path('auth/menu')); |
36 | 36 | |
@@ -63,10 +63,10 @@ discard block |
||
63 | 63 | */ |
64 | 64 | protected function treeView() |
65 | 65 | { |
66 | - return Menu::tree(function (Tree $tree) { |
|
66 | + return Menu::tree(function(Tree $tree) { |
|
67 | 67 | $tree->disableCreate(); |
68 | 68 | |
69 | - $tree->branch(function ($branch) { |
|
69 | + $tree->branch(function($branch) { |
|
70 | 70 | $payload = "<i class='fa {$branch['icon']}'></i> <strong>{$branch['title']}</strong>"; |
71 | 71 | |
72 | 72 | if (!isset($branch['children'])) { |
@@ -90,14 +90,14 @@ discard block |
||
90 | 90 | $grid->created_at(trans('admin.created_at')); |
91 | 91 | $grid->updated_at(trans('admin.updated_at')); |
92 | 92 | |
93 | - $grid->actions(function (Grid\Displayers\Actions $actions) { |
|
93 | + $grid->actions(function(Grid\Displayers\Actions $actions) { |
|
94 | 94 | if ($actions->row->slug == 'administrator') { |
95 | 95 | $actions->disableDelete(); |
96 | 96 | } |
97 | 97 | }); |
98 | 98 | |
99 | - $grid->tools(function (Grid\Tools $tools) { |
|
100 | - $tools->batch(function (Grid\Tools\BatchActions $actions) { |
|
99 | + $grid->tools(function(Grid\Tools $tools) { |
|
100 | + $tools->batch(function(Grid\Tools\BatchActions $actions) { |
|
101 | 101 | $actions->disableDelete(); |
102 | 102 | }); |
103 | 103 | }); |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | $show->id('ID'); |
119 | 119 | $show->slug(trans('admin.slug')); |
120 | 120 | $show->name(trans('admin.name')); |
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')); |
@@ -35,14 +35,14 @@ discard block |
||
35 | 35 | |
36 | 36 | $grid->id('ID')->sortable(); |
37 | 37 | $grid->user()->name('User'); |
38 | - $grid->method()->display(function ($method) { |
|
38 | + $grid->method()->display(function($method) { |
|
39 | 39 | $color = array_get(OperationLog::$methodColors, $method, 'grey'); |
40 | 40 | |
41 | 41 | return "<span class=\"badge bg-$color\">$method</span>"; |
42 | 42 | }); |
43 | 43 | $grid->path()->label('info'); |
44 | 44 | $grid->ip()->label('primary'); |
45 | - $grid->input()->display(function ($input) { |
|
45 | + $grid->input()->display(function($input) { |
|
46 | 46 | $input = json_decode($input, true); |
47 | 47 | $input = array_except($input, ['_pjax', '_token', '_method', '_previous_']); |
48 | 48 | if (empty($input)) { |
@@ -54,14 +54,14 @@ discard block |
||
54 | 54 | |
55 | 55 | $grid->created_at(trans('admin.created_at')); |
56 | 56 | |
57 | - $grid->actions(function (Grid\Displayers\Actions $actions) { |
|
57 | + $grid->actions(function(Grid\Displayers\Actions $actions) { |
|
58 | 58 | $actions->disableEdit(); |
59 | 59 | $actions->disableView(); |
60 | 60 | }); |
61 | 61 | |
62 | 62 | $grid->disableCreation(); |
63 | 63 | |
64 | - $grid->filter(function ($filter) { |
|
64 | + $grid->filter(function($filter) { |
|
65 | 65 | $filter->equal('user_id', 'User')->select(Administrator::all()->pluck('name', 'id')); |
66 | 66 | $filter->equal('method')->select(array_combine(OperationLog::$methods, OperationLog::$methods)); |
67 | 67 | $filter->like('path'); |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | } |
49 | 49 | |
50 | 50 | if (is_array($relations)) { |
51 | - if(is_null(current($relations))){ |
|
51 | + if (is_null(current($relations))) { |
|
52 | 52 | $this->value = null; |
53 | 53 | } |
54 | 54 | else if (is_string(current($relations))) { |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | } |
71 | 71 | |
72 | 72 | if (is_array($relations)) { |
73 | - if(is_null(current($relations))){ |
|
73 | + if (is_null(current($relations))) { |
|
74 | 74 | $this->original = null; |
75 | 75 | } |
76 | 76 | else if (is_string(current($relations))) { |
@@ -50,8 +50,7 @@ discard block |
||
50 | 50 | if (is_array($relations)) { |
51 | 51 | if(is_null(current($relations))){ |
52 | 52 | $this->value = null; |
53 | - } |
|
54 | - else if (is_string(current($relations))) { |
|
53 | + } else if (is_string(current($relations))) { |
|
55 | 54 | $this->value = $relations; |
56 | 55 | } else { |
57 | 56 | foreach ($relations as $relation) { |
@@ -72,8 +71,7 @@ discard block |
||
72 | 71 | if (is_array($relations)) { |
73 | 72 | if(is_null(current($relations))){ |
74 | 73 | $this->original = null; |
75 | - } |
|
76 | - else if (is_string(current($relations))) { |
|
74 | + } else if (is_string(current($relations))) { |
|
77 | 75 | $this->original = $relations; |
78 | 76 | } else { |
79 | 77 | foreach ($relations as $relation) { |
@@ -56,8 +56,8 @@ |
||
56 | 56 | */ |
57 | 57 | protected function listAdminCommands() |
58 | 58 | { |
59 | - $commands = collect(Artisan::all())->mapWithKeys(function ($command, $key) { |
|
60 | - if (Str::startsWith($key, 'admin:')) { |
|
59 | + $commands = collect(Artisan::all())->mapWithKeys(function($command, $key) { |
|
60 | + if (Str::startsWith($key, 'admin:')) { |
|
61 | 61 | return [$key => $command]; |
62 | 62 | } |
63 | 63 |