Completed
Pull Request — master (#2661)
by jxlwqq
05:15
created
src/Controllers/AuthController.php 2 patches
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
     {
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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'));
Please login to merge, or discard this patch.
src/Controllers/UserController.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -87,14 +87,14 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
             }
Please login to merge, or discard this patch.
src/Controllers/RoleController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -90,14 +90,14 @@  discard block
 block discarded – undo
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
 block discarded – undo
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'));
Please login to merge, or discard this patch.
src/Console/CreateUserCommand.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@
 block discarded – undo
38 38
         /** @var array $selected */
39 39
         $selected = $this->choice('Please choose a role for the user', $roles->pluck('name')->toArray(), null, null, true);
40 40
 
41
-        $roles = $roles->filter(function ($role) use ($selected) {
41
+        $roles = $roles->filter(function($role) use ($selected) {
42 42
             return in_array($role->name, $selected);
43 43
         });
44 44
 
Please login to merge, or discard this patch.
src/Console/ResetPasswordCommand.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@
 block discarded – undo
31 31
         askForUserName:
32 32
         $username = $this->askWithCompletion('Please enter a username who needs to reset his password', $users->pluck('username')->toArray());
33 33
 
34
-        $user = $users->first(function ($user) use ($username) {
34
+        $user = $users->first(function($user) use ($username) {
35 35
             return $user->username == $username;
36 36
         });
37 37
 
Please login to merge, or discard this patch.
src/Grid/Tools.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
      */
86 86
     public function disableFilterButton()
87 87
     {
88
-        $this->tools = $this->tools->reject(function ($tool) {
88
+        $this->tools = $this->tools->reject(function($tool) {
89 89
             return $tool instanceof FilterButton;
90 90
         });
91 91
     }
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
      */
98 98
     public function disableRefreshButton()
99 99
     {
100
-        $this->tools = $this->tools->reject(function ($tool) {
100
+        $this->tools = $this->tools->reject(function($tool) {
101 101
             return $tool instanceof RefreshButton;
102 102
         });
103 103
     }
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
      */
110 110
     public function disableBatchActions()
111 111
     {
112
-        $this->tools = $this->tools->reject(function ($tool) {
112
+        $this->tools = $this->tools->reject(function($tool) {
113 113
             return $tool instanceof BatchActions;
114 114
         });
115 115
     }
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
      */
120 120
     public function batch(\Closure $closure)
121 121
     {
122
-        call_user_func($closure, $this->tools->first(function ($tool) {
122
+        call_user_func($closure, $this->tools->first(function($tool) {
123 123
             return $tool instanceof BatchActions;
124 124
         }));
125 125
     }
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
      */
132 132
     public function render()
133 133
     {
134
-        return $this->tools->map(function ($tool) {
134
+        return $this->tools->map(function($tool) {
135 135
             if ($tool instanceof AbstractTool) {
136 136
                 return $tool->setGrid($this->grid)->render();
137 137
             }
Please login to merge, or discard this patch.
src/Console/AdminCommand.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@
 block discarded – undo
56 56
      */
57 57
     protected function listAdminCommands()
58 58
     {
59
-        $commands = collect(Artisan::all())->mapWithKeys(function ($command, $key) {
59
+        $commands = collect(Artisan::all())->mapWithKeys(function($command, $key) {
60 60
             if (Str::startsWith($key, 'admin:')) {
61 61
                 return [$key => $command];
62 62
             }
Please login to merge, or discard this patch.
src/Form/Tab.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
         $all = $fields->toArray();
71 71
 
72 72
         foreach ($this->form->rows as $row) {
73
-            $rowFields = array_map(function ($field) {
73
+            $rowFields = array_map(function($field) {
74 74
                 return $field['element'];
75 75
             }, $row->getFields());
76 76
 
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
     public function getTabs()
105 105
     {
106 106
         // If there is no active tab, then active the first.
107
-        if ($this->tabs->filter(function ($tab) {
107
+        if ($this->tabs->filter(function($tab) {
108 108
             return $tab['active'];
109 109
         })->isEmpty()) {
110 110
             $first = $this->tabs->first();
Please login to merge, or discard this patch.
src/Form.php 2 patches
Doc Comments   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -265,7 +265,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
     {
@@ -429,7 +429,7 @@  discard block
 block discarded – undo
429 429
     /**
430 430
      * Call submitted callback.
431 431
      *
432
-     * @return mixed
432
+     * @return Response|null
433 433
      */
434 434
     protected function callSubmitted()
435 435
     {
@@ -443,7 +443,7 @@  discard block
 block discarded – undo
443 443
     /**
444 444
      * Call saving callback.
445 445
      *
446
-     * @return mixed
446
+     * @return Response|null
447 447
      */
448 448
     protected function callSaving()
449 449
     {
@@ -457,7 +457,7 @@  discard block
 block discarded – undo
457 457
     /**
458 458
      * Callback after saving a Model.
459 459
      *
460
-     * @return mixed|null
460
+     * @return Response|null
461 461
      */
462 462
     protected function callSaved()
463 463
     {
@@ -551,7 +551,7 @@  discard block
 block discarded – undo
551 551
     /**
552 552
      * Get RedirectResponse after update.
553 553
      *
554
-     * @param mixed $key
554
+     * @param integer $key
555 555
      *
556 556
      * @return \Illuminate\Http\RedirectResponse
557 557
      */
Please login to merge, or discard this patch.
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -291,7 +291,7 @@  discard block
 block discarded – undo
291 291
      */
292 292
     public function destroy($id)
293 293
     {
294
-        collect(explode(',', $id))->filter()->each(function ($id) {
294
+        collect(explode(',', $id))->filter()->each(function($id) {
295 295
             $builder = $this->model()->newQuery();
296 296
 
297 297
             if ($this->isSoftDeletes) {
@@ -329,9 +329,9 @@  discard block
 block discarded – undo
329 329
 
330 330
         $data = $model->toArray();
331 331
 
332
-        $this->builder->fields()->filter(function ($field) {
332
+        $this->builder->fields()->filter(function($field) {
333 333
             return $field instanceof Field\File;
334
-        })->each(function (Field\File $file) use ($data) {
334
+        })->each(function(Field\File $file) use ($data) {
335 335
             $file->setOriginal($data);
336 336
 
337 337
             $file->destroy();
@@ -356,7 +356,7 @@  discard block
 block discarded – undo
356 356
             return $response;
357 357
         }
358 358
 
359
-        DB::transaction(function () {
359
+        DB::transaction(function() {
360 360
             $inserts = $this->prepareInsert($this->updates);
361 361
 
362 362
             foreach ($inserts as $column => $value) {
@@ -559,7 +559,7 @@  discard block
 block discarded – undo
559 559
             return $response;
560 560
         }
561 561
 
562
-        DB::transaction(function () {
562
+        DB::transaction(function() {
563 563
             $updates = $this->prepareUpdate($this->updates);
564 564
 
565 565
             foreach ($updates as $column => $value) {
@@ -1028,7 +1028,7 @@  discard block
 block discarded – undo
1028 1028
     protected function getFieldByColumn($column)
1029 1029
     {
1030 1030
         return $this->builder->fields()->first(
1031
-            function (Field $field) use ($column) {
1031
+            function(Field $field) use ($column) {
1032 1032
                 if (is_array($field->column())) {
1033 1033
                     return in_array($column, $field->column());
1034 1034
                 }
@@ -1049,7 +1049,7 @@  discard block
 block discarded – undo
1049 1049
 
1050 1050
         $values = $this->model->toArray();
1051 1051
 
1052
-        $this->builder->fields()->each(function (Field $field) use ($values) {
1052
+        $this->builder->fields()->each(function(Field $field) use ($values) {
1053 1053
             $field->setOriginal($values);
1054 1054
         });
1055 1055
     }
@@ -1079,7 +1079,7 @@  discard block
 block discarded – undo
1079 1079
 
1080 1080
         $data = $this->model->toArray();
1081 1081
 
1082
-        $this->builder->fields()->each(function (Field $field) use ($data) {
1082
+        $this->builder->fields()->each(function(Field $field) use ($data) {
1083 1083
             if (!in_array($field->column(), $this->ignored)) {
1084 1084
                 $field->fill($data);
1085 1085
             }
@@ -1202,7 +1202,7 @@  discard block
 block discarded – undo
1202 1202
      */
1203 1203
     public function setWidth($fieldWidth = 8, $labelWidth = 2)
1204 1204
     {
1205
-        $this->builder()->fields()->each(function ($field) use ($fieldWidth, $labelWidth) {
1205
+        $this->builder()->fields()->each(function($field) use ($fieldWidth, $labelWidth) {
1206 1206
             /* @var Field $field  */
1207 1207
             $field->setWidth($fieldWidth, $labelWidth);
1208 1208
         });
Please login to merge, or discard this patch.