Completed
Pull Request — master (#2448)
by jxlwqq
02:39
created
src/Grid/Filter/Scope.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@
 block discarded – undo
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
     }
Please login to merge, or discard this patch.
src/Form/Tools.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -288,7 +288,7 @@
 block discarded – undo
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
             }
Please login to merge, or discard this patch.
src/Show/Tools.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -275,7 +275,7 @@
 block discarded – undo
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
             }
Please login to merge, or discard this patch.
src/Grid/Displayers/Table.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@
 block discarded – undo
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);
Please login to merge, or discard this patch.
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/MenuController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -27,10 +27,10 @@  discard block
 block discarded – undo
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
 block discarded – undo
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>&nbsp;<strong>{$branch['title']}</strong>";
71 71
 
72 72
                 if (!isset($branch['children'])) {
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/Controllers/LogController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -35,14 +35,14 @@  discard block
 block discarded – undo
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
 block discarded – undo
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');
Please login to merge, or discard this patch.