Completed
Pull Request — master (#5493)
by
unknown
01:01
created
src/Controllers/UserController.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -35,14 +35,14 @@  discard block
 block discarded – undo
35 35
         $grid->column('created_at', trans('admin.created_at'));
36 36
         $grid->column('updated_at', trans('admin.updated_at'));
37 37
 
38
-        $grid->actions(function (Grid\Displayers\Actions $actions) {
38
+        $grid->actions(function(Grid\Displayers\Actions $actions) {
39 39
             if ($actions->getKey() == 1) {
40 40
                 $actions->disableDelete();
41 41
             }
42 42
         });
43 43
 
44
-        $grid->tools(function (Grid\Tools $tools) {
45
-            $tools->batch(function (Grid\Tools\BatchActions $actions) {
44
+        $grid->tools(function(Grid\Tools $tools) {
45
+            $tools->batch(function(Grid\Tools\BatchActions $actions) {
46 46
                 $actions->disableDelete();
47 47
             });
48 48
         });
@@ -66,10 +66,10 @@  discard block
 block discarded – undo
66 66
         $show->field('id', 'ID');
67 67
         $show->field('username', trans('admin.username'));
68 68
         $show->field('name', trans('admin.name'));
69
-        $show->field('roles', trans('admin.roles'))->as(function ($roles) {
69
+        $show->field('roles', trans('admin.roles'))->as(function($roles) {
70 70
             return $roles->pluck('name');
71 71
         })->label();
72
-        $show->field('permissions', trans('admin.permissions'))->as(function ($permission) {
72
+        $show->field('permissions', trans('admin.permissions'))->as(function($permission) {
73 73
             return $permission->pluck('name');
74 74
         })->label();
75 75
         $show->field('created_at', trans('admin.created_at'));
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
         $form->image('avatar', trans('admin.avatar'));
104 104
         $form->password('password', trans('admin.password'))->rules('required|confirmed');
105 105
         $form->password('password_confirmation', trans('admin.password_confirmation'))->rules('required')
106
-            ->default(function ($form) {
106
+            ->default(function($form) {
107 107
                 return $form->model()->password;
108 108
             });
109 109
 
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
         $form->display('created_at', trans('admin.created_at'));
116 116
         $form->display('updated_at', trans('admin.updated_at'));
117 117
 
118
-        $form->saving(function (Form $form) {
118
+        $form->saving(function(Form $form) {
119 119
             if ($form->password && $form->model()->password != $form->password) {
120 120
                 $form->password = Hash::make($form->password);
121 121
             }
Please login to merge, or discard this patch.
src/Controllers/AuthController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
     {
97 97
         $form = $this->settingForm();
98 98
         $form->tools(
99
-            function (Form\Tools $tools) {
99
+            function(Form\Tools $tools) {
100 100
                 $tools->disableList();
101 101
                 $tools->disableDelete();
102 102
                 $tools->disableView();
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
         $form->image('avatar', trans('admin.avatar'));
135 135
         $form->password('password', trans('admin.password'))->rules('confirmed|required');
136 136
         $form->password('password_confirmation', trans('admin.password_confirmation'))->rules('required')
137
-            ->default(function ($form) {
137
+            ->default(function($form) {
138 138
                 return $form->model()->password;
139 139
             });
140 140
 
@@ -142,13 +142,13 @@  discard block
 block discarded – undo
142 142
 
143 143
         $form->ignore(['password_confirmation']);
144 144
 
145
-        $form->saving(function (Form $form) {
145
+        $form->saving(function(Form $form) {
146 146
             if ($form->password && $form->model()->password != $form->password) {
147 147
                 $form->password = Hash::make($form->password);
148 148
             }
149 149
         });
150 150
 
151
-        $form->saved(function () {
151
+        $form->saved(function() {
152 152
             admin_toastr(trans('admin.update_succeeded'));
153 153
 
154 154
             return redirect(admin_url('auth/setting'));
Please login to merge, or discard this patch.
src/Form.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -253,7 +253,7 @@  discard block
 block discarded – undo
253 253
                 return $ret;
254 254
             }
255 255
 
256
-            collect(explode(',', $id))->filter()->each(function ($id) {
256
+            collect(explode(',', $id))->filter()->each(function($id) {
257 257
                 $builder = $this->model()->newQuery();
258 258
 
259 259
                 if ($this->isSoftDeletes) {
@@ -306,9 +306,9 @@  discard block
 block discarded – undo
306 306
 
307 307
         $data = $model->toArray();
308 308
 
309
-        $this->fields()->filter(function ($field) {
309
+        $this->fields()->filter(function($field) {
310 310
             return $field instanceof Field\File;
311
-        })->each(function (Field\File $file) use ($data) {
311
+        })->each(function(Field\File $file) use ($data) {
312 312
             $file->setOriginal($data);
313 313
 
314 314
             $file->destroy();
@@ -333,7 +333,7 @@  discard block
 block discarded – undo
333 333
             return $response;
334 334
         }
335 335
 
336
-        DB::transaction(function () {
336
+        DB::transaction(function() {
337 337
             $inserts = $this->prepareInsert($this->updates);
338 338
 
339 339
             foreach ($inserts as $column => $value) {
@@ -537,7 +537,7 @@  discard block
 block discarded – undo
537 537
             return $response;
538 538
         }
539 539
 
540
-        DB::transaction(function () {
540
+        DB::transaction(function() {
541 541
             $updates = $this->prepareUpdate($this->updates);
542 542
 
543 543
             foreach ($updates as $column => $value) {
@@ -987,7 +987,7 @@  discard block
 block discarded – undo
987 987
     protected function getFieldByColumn($column)
988 988
     {
989 989
         return $this->fields()->first(
990
-            function (Field $field) use ($column) {
990
+            function(Field $field) use ($column) {
991 991
                 if (is_array($field->column())) {
992 992
                     return in_array($column, $field->column());
993 993
                 }
@@ -1006,7 +1006,7 @@  discard block
 block discarded – undo
1006 1006
     {
1007 1007
         $values = $this->model->toArray();
1008 1008
 
1009
-        $this->fields()->each(function (Field $field) use ($values) {
1009
+        $this->fields()->each(function(Field $field) use ($values) {
1010 1010
             $field->setOriginal($values);
1011 1011
         });
1012 1012
     }
@@ -1020,7 +1020,7 @@  discard block
 block discarded – undo
1020 1020
     {
1021 1021
         $relations = $this->getRelations();
1022 1022
 
1023
-        $this->fields()->each(function (Field $field) use ($relations) {
1023
+        $this->fields()->each(function(Field $field) use ($relations) {
1024 1024
             if ($field->getSnakeAttributes()) {
1025 1025
                 return;
1026 1026
             }
@@ -1062,7 +1062,7 @@  discard block
 block discarded – undo
1062 1062
 
1063 1063
         $data = $this->model->toArray();
1064 1064
 
1065
-        $this->fields()->each(function (Field $field) use ($data) {
1065
+        $this->fields()->each(function(Field $field) use ($data) {
1066 1066
             if (!in_array($field->column(), $this->ignored, true)) {
1067 1067
                 $field->fill($data);
1068 1068
             }
@@ -1193,7 +1193,7 @@  discard block
 block discarded – undo
1193 1193
      */
1194 1194
     public function setWidth($fieldWidth = 8, $labelWidth = 2): self
1195 1195
     {
1196
-        $this->fields()->each(function ($field) use ($fieldWidth, $labelWidth) {
1196
+        $this->fields()->each(function($field) use ($fieldWidth, $labelWidth) {
1197 1197
             /* @var Field $field  */
1198 1198
             $field->setWidth($fieldWidth, $labelWidth);
1199 1199
         });
Please login to merge, or discard this patch.
src/Grid/Concerns/CanHidesColumns.php 1 patch
Spacing   +3 added lines, -4 removed lines patch added patch discarded remove patch
@@ -74,8 +74,7 @@  discard block
 block discarded – undo
74 74
 
75 75
         $columns = $requestColumn ? explode(',', $requestColumn) : [];
76 76
 
77
-        return array_filter($columns) ?:
78
-            array_values(array_diff($this->columnNames, $this->hiddenColumns));
77
+        return array_filter($columns) ?: array_values(array_diff($this->columnNames, $this->hiddenColumns));
79 78
     }
80 79
 
81 80
     /**
@@ -93,7 +92,7 @@  discard block
 block discarded – undo
93 92
 
94 93
         array_push($visible, Grid\Column::SELECT_COLUMN_NAME, Grid\Column::ACTION_COLUMN_NAME);
95 94
 
96
-        return $this->columns->filter(function (Grid\Column $column) use ($visible) {
95
+        return $this->columns->filter(function(Grid\Column $column) use ($visible) {
97 96
             return in_array($column->getName(), $visible);
98 97
         });
99 98
     }
@@ -113,7 +112,7 @@  discard block
 block discarded – undo
113 112
 
114 113
         array_push($visible, Grid\Column::SELECT_COLUMN_NAME, Grid\Column::ACTION_COLUMN_NAME);
115 114
 
116
-        return collect($this->columnNames)->filter(function ($column) use ($visible) {
115
+        return collect($this->columnNames)->filter(function($column) use ($visible) {
117 116
             return in_array($column, $visible);
118 117
         })->toArray();
119 118
     }
Please login to merge, or discard this patch.
src/Grid/Column.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -430,7 +430,7 @@  discard block
 block discarded – undo
430 430
 
431 431
         $column = $this;
432 432
 
433
-        return $this->display(function ($value) use ($grid, $column, $abstract, $arguments) {
433
+        return $this->display(function($value) use ($grid, $column, $abstract, $arguments) {
434 434
             /** @var AbstractDisplayer $displayer */
435 435
             $displayer = new $abstract($value, $grid, $column, $this);
436 436
 
@@ -479,7 +479,7 @@  discard block
 block discarded – undo
479 479
 
480 480
         $grid = $this->grid;
481 481
 
482
-        return $this->display(function ($_, $column) use ($action, $grid) {
482
+        return $this->display(function($_, $column) use ($action, $grid) {
483 483
             /** @var RowAction $action */
484 484
             $action = new $action();
485 485
 
@@ -607,7 +607,7 @@  discard block
 block discarded – undo
607 607
         $grid = $this->grid;
608 608
         $column = $this;
609 609
 
610
-        $this->display(function ($value) use ($grid, $column, $class) {
610
+        $this->display(function($value) use ($grid, $column, $class) {
611 611
             /** @var AbstractDisplayer $definition */
612 612
             $definition = new $class($value, $grid, $column, $this);
613 613
 
@@ -625,7 +625,7 @@  discard block
 block discarded – undo
625 625
     protected function htmlEntityEncode($item)
626 626
     {
627 627
         if (is_array($item)) {
628
-            array_walk_recursive($item, function (&$value) {
628
+            array_walk_recursive($item, function(&$value) {
629 629
                 $value = htmlentities($value ?? '');
630 630
             });
631 631
         } else {
@@ -662,7 +662,7 @@  discard block
 block discarded – undo
662 662
      */
663 663
     protected function callSupportDisplayer($abstract, $arguments)
664 664
     {
665
-        return $this->display(function ($value) use ($abstract, $arguments) {
665
+        return $this->display(function($value) use ($abstract, $arguments) {
666 666
             if (is_array($value) || $value instanceof Arrayable) {
667 667
                 return call_user_func_array([collect($value), $abstract], $arguments);
668 668
             }
@@ -686,7 +686,7 @@  discard block
 block discarded – undo
686 686
     protected function callBuiltinDisplayer($abstract, $arguments)
687 687
     {
688 688
         if ($abstract instanceof Closure) {
689
-            return $this->display(function ($value) use ($abstract, $arguments) {
689
+            return $this->display(function($value) use ($abstract, $arguments) {
690 690
                 return $abstract->call($this, ...array_merge([$value], $arguments));
691 691
             });
692 692
         }
@@ -695,7 +695,7 @@  discard block
 block discarded – undo
695 695
             $grid = $this->grid;
696 696
             $column = $this;
697 697
 
698
-            return $this->display(function ($value) use ($abstract, $grid, $column, $arguments) {
698
+            return $this->display(function($value) use ($abstract, $grid, $column, $arguments) {
699 699
                 /** @var AbstractDisplayer $displayer */
700 700
                 $displayer = new $abstract($value, $grid, $column, $this);
701 701
 
Please login to merge, or discard this patch.
src/Grid/Displayers/Label.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@
 block discarded – undo
13 13
             $this->value = $this->value->toArray();
14 14
         }
15 15
 
16
-        return collect((array) $this->value)->map(function ($item) use ($style) {
16
+        return collect((array) $this->value)->map(function($item) use ($style) {
17 17
             if (is_array($style)) {
18 18
                 $columnValue = $this->getColumn()->getOriginal();
19 19
 
Please login to merge, or discard this patch.
src/Grid/Exporters/CsvExporter.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -157,16 +157,16 @@  discard block
 block discarded – undo
157 157
             call_user_func($this->callback, $this);
158 158
         }
159 159
 
160
-        $response = function () {
160
+        $response = function() {
161 161
             $handle = fopen('php://output', 'w');
162 162
             $titles = [];
163 163
             fwrite($handle, chr(0xEF).chr(0xBB).chr(0xBF)); //导出的CSV文件是无BOM编码UTF-8,而我们通常使用UTF-8编码格式都是有BOM的。所以添加BOM于CSV中
164
-            $this->chunk(function ($collection) use ($handle, &$titles) {
164
+            $this->chunk(function($collection) use ($handle, &$titles) {
165 165
                 Column::setOriginalGridModels($collection);
166 166
 
167 167
                 $original = $current = $collection->toArray();
168 168
 
169
-                $this->grid->getColumns()->map(function (Column $column) use (&$current) {
169
+                $this->grid->getColumns()->map(function(Column $column) use (&$current) {
170 170
                     $current = $column->fill($current);
171 171
                     $this->grid->columnNames[] = $column->getName();
172 172
                 });
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
     protected function getVisiableTitles()
196 196
     {
197 197
         $titles = $this->grid->visibleColumns()
198
-            ->mapWithKeys(function (Column $column) {
198
+            ->mapWithKeys(function(Column $column) {
199 199
                 $columnName = $column->getName();
200 200
                 $columnTitle = $column->getLabel();
201 201
                 if (isset($this->titleCallbacks[$columnName])) {
Please login to merge, or discard this patch.
src/Grid/Model.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -325,9 +325,9 @@  discard block
 block discarded – undo
325 325
 
326 326
         $this->setSort();
327 327
 
328
-        $this->queries->reject(function ($query) {
328
+        $this->queries->reject(function($query) {
329 329
             return $query['method'] == 'paginate';
330
-        })->each(function ($query) {
330
+        })->each(function($query) {
331 331
             $this->model = $this->model->{$query['method']}(...$query['arguments']);
332 332
         });
333 333
 
@@ -378,7 +378,7 @@  discard block
 block discarded – undo
378 378
         $this->setSort();
379 379
         $this->setPaginate();
380 380
 
381
-        $this->queries->unique()->each(function ($query) {
381
+        $this->queries->unique()->each(function($query) {
382 382
             $this->model = call_user_func_array([$this->model, $query['method']], $query['arguments']);
383 383
         });
384 384
 
@@ -408,9 +408,9 @@  discard block
 block discarded – undo
408 408
 
409 409
         $queryBuilder = $this->originalModel;
410 410
 
411
-        $this->queries->reject(function ($query) {
411
+        $this->queries->reject(function($query) {
412 412
             return in_array($query['method'], ['get', 'paginate']);
413
-        })->each(function ($query) use (&$queryBuilder) {
413
+        })->each(function($query) use (&$queryBuilder) {
414 414
             $queryBuilder = $queryBuilder->{$query['method']}(...$query['arguments']);
415 415
         });
416 416
 
@@ -444,7 +444,7 @@  discard block
 block discarded – undo
444 444
     {
445 445
         $paginate = $this->findQueryByMethod('paginate');
446 446
 
447
-        $this->queries = $this->queries->reject(function ($query) {
447
+        $this->queries = $this->queries->reject(function($query) {
448 448
             return $query['method'] == 'paginate';
449 449
         });
450 450
 
@@ -502,7 +502,7 @@  discard block
 block discarded – undo
502 502
      */
503 503
     protected function findQueryByMethod($method)
504 504
     {
505
-        return $this->queries->first(function ($query) use ($method) {
505
+        return $this->queries->first(function($query) use ($method) {
506 506
             return $query['method'] == $method;
507 507
         });
508 508
     }
@@ -525,7 +525,7 @@  discard block
 block discarded – undo
525 525
         }
526 526
 
527 527
         $columnNameContainsDots = Str::contains($columnName, '.');
528
-        $isRelation = $this->queries->contains(function ($query) use ($columnName) {
528
+        $isRelation = $this->queries->contains(function($query) use ($columnName) {
529 529
             // relationship should be camel case
530 530
             $columnName = Str::camel(Str::before($columnName, '.'));
531 531
 
@@ -576,7 +576,7 @@  discard block
 block discarded – undo
576 576
         // relationship should be camel case
577 577
         $relationName = Str::camel($relationName);
578 578
 
579
-        if ($this->queries->contains(function ($query) use ($relationName) {
579
+        if ($this->queries->contains(function($query) use ($relationName) {
580 580
             return $query['method'] == 'with' && in_array($relationName, $query['arguments']);
581 581
         })) {
582 582
             $relation = $this->model->$relationName();
@@ -610,7 +610,7 @@  discard block
 block discarded – undo
610 610
      */
611 611
     public function resetOrderBy()
612 612
     {
613
-        $this->queries = $this->queries->reject(function ($query) {
613
+        $this->queries = $this->queries->reject(function($query) {
614 614
             return $query['method'] == 'orderBy' || $query['method'] == 'orderByDesc';
615 615
         });
616 616
     }
Please login to merge, or discard this patch.
src/Console/GenerateMenuCommand.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
     public function handle()
50 50
     {
51 51
         $prefix = config('admin.route.prefix');
52
-        $routes = collect($this->router->getRoutes())->filter(function (Route $route) use ($prefix) {
52
+        $routes = collect($this->router->getRoutes())->filter(function(Route $route) use ($prefix) {
53 53
             $uri = $route->uri();
54 54
             // built-in, parameterized and no-GET are ignored
55 55
             return Str::startsWith($uri, "{$prefix}/")
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
                 && in_array('GET', $route->methods())
60 60
                 && !in_array(substr($route->uri(), strlen("{$prefix}/")), config('admin.menu_exclude'));
61 61
         })
62
-            ->map(function (Route $route) use ($prefix) {
62
+            ->map(function(Route $route) use ($prefix) {
63 63
                 $uri = substr($route->uri(), strlen("{$prefix}/"));
64 64
 
65 65
                 return [
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 
74 74
         $menus = Menu::all()->pluck('title', 'uri');
75 75
         // exclude exist ones
76
-        $news = $routes->diffKeys($menus)->map(function ($item, $key) {
76
+        $news = $routes->diffKeys($menus)->map(function($item, $key) {
77 77
             return [
78 78
                 'title' => $item,
79 79
                 'uri'   => $key,
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
         } else {
88 88
             if ($this->hasOption('dry-run') && $this->option('dry-run')) {
89 89
                 $this->line('<info>The following menu items will be created</info>: ');
90
-                $this->table(['Title', 'Uri'], array_map(function ($item) {
90
+                $this->table(['Title', 'Uri'], array_map(function($item) {
91 91
                     return [
92 92
                         $item['title'],
93 93
                         $item['uri'],
Please login to merge, or discard this patch.