Completed
Pull Request — master (#5493)
by
unknown
19s
created
src/Grid/Displayers/SwitchGroup.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
         $this->overrideStates($states);
13 13
 
14 14
         if (!Arr::isAssoc($columns)) {
15
-            $columns = collect($columns)->map(function ($column) {
15
+            $columns = collect($columns)->map(function($column) {
16 16
                 return [$column => ucfirst($column)];
17 17
             })->collapse();
18 18
         }
Please login to merge, or discard this patch.
src/Form/Field/CanCascadeFields.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
     {
105 105
         if ($this->form) {
106 106
             $this->form->fields()
107
-                ->filter(function (Form\Field $field) {
107
+                ->filter(function(Form\Field $field) {
108 108
                     return $field instanceof CascadeGroup
109 109
                         && $field->dependsOn($this)
110 110
                         && $this->hitsCondition($field);
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
             return;
167 167
         }
168 168
 
169
-        $cascadeGroups = collect($this->conditions)->map(function ($condition) {
169
+        $cascadeGroups = collect($this->conditions)->map(function($condition) {
170 170
             return [
171 171
                 'class'    => $this->getCascadeClass($condition['value']),
172 172
                 'operator' => $condition['operator'],
Please login to merge, or discard this patch.
src/Grid.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -314,7 +314,7 @@  discard block
 block discarded – undo
314 314
         $column = new Column($column, $label);
315 315
         $column->setGrid($this);
316 316
 
317
-        return tap($column, function ($value) {
317
+        return tap($column, function($value) {
318 318
             $this->columns->push($value);
319 319
         });
320 320
     }
@@ -388,7 +388,7 @@  discard block
 block discarded – undo
388 388
         $column = new Column($column, $label);
389 389
         $column->setGrid($this);
390 390
 
391
-        return tap($column, function ($value) {
391
+        return tap($column, function($value) {
392 392
             $this->columns->prepend($value);
393 393
         });
394 394
     }
@@ -566,7 +566,7 @@  discard block
 block discarded – undo
566 566
 
567 567
         $data = $collection->toArray();
568 568
 
569
-        $this->columns->map(function (Column $column) use (&$data) {
569
+        $this->columns->map(function(Column $column) use (&$data) {
570 570
             $data = $column->fill($data);
571 571
 
572 572
             $this->columnNames[] = $column->getName();
@@ -587,7 +587,7 @@  discard block
 block discarded – undo
587 587
      */
588 588
     protected function buildRows(array $data, Collection $collection)
589 589
     {
590
-        $this->rows = collect($data)->map(function ($model, $number) use ($collection) {
590
+        $this->rows = collect($data)->map(function($model, $number) use ($collection) {
591 591
             return new Row($number, $model, $collection->get($number)->getKey());
592 592
         });
593 593
 
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
@@ -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.