Completed
Pull Request — master (#3469)
by jxlwqq
02:17
created
src/Controllers/MenuController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -26,10 +26,10 @@  discard block
 block discarded – undo
26 26
         return $content
27 27
             ->title(trans('admin.menu'))
28 28
             ->description(trans('admin.list'))
29
-            ->row(function (Row $row) {
29
+            ->row(function(Row $row) {
30 30
                 $row->column(6, $this->treeView()->render());
31 31
 
32
-                $row->column(6, function (Column $column) {
32
+                $row->column(6, function(Column $column) {
33 33
                     $form = new \Encore\Admin\Widgets\Form();
34 34
                     $form->action(admin_base_path('auth/menu'));
35 35
 
@@ -71,10 +71,10 @@  discard block
 block discarded – undo
71 71
     {
72 72
         $menuModel = config('admin.database.menu_model');
73 73
 
74
-        return $menuModel::tree(function (Tree $tree) {
74
+        return $menuModel::tree(function(Tree $tree) {
75 75
             $tree->disableCreate();
76 76
 
77
-            $tree->branch(function ($branch) {
77
+            $tree->branch(function($branch) {
78 78
                 $payload = "<i class='fa {$branch['icon']}'></i>&nbsp;<strong>{$branch['title']}</strong>";
79 79
 
80 80
                 if (!isset($branch['children'])) {
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
@@ -34,14 +34,14 @@  discard block
 block discarded – undo
34 34
         $grid->column('created_at', trans('admin.created_at'));
35 35
         $grid->column('updated_at', trans('admin.updated_at'));
36 36
 
37
-        $grid->actions(function (Grid\Displayers\Actions $actions) {
37
+        $grid->actions(function(Grid\Displayers\Actions $actions) {
38 38
             if ($actions->getKey() == 1) {
39 39
                 $actions->disableDelete();
40 40
             }
41 41
         });
42 42
 
43
-        $grid->tools(function (Grid\Tools $tools) {
44
-            $tools->batch(function (Grid\Tools\BatchActions $actions) {
43
+        $grid->tools(function(Grid\Tools $tools) {
44
+            $tools->batch(function(Grid\Tools\BatchActions $actions) {
45 45
                 $actions->disableDelete();
46 46
             });
47 47
         });
@@ -65,10 +65,10 @@  discard block
 block discarded – undo
65 65
         $show->field('id', 'ID');
66 66
         $show->field('username', trans('admin.username'));
67 67
         $show->field('name', trans('admin.name'));
68
-        $show->field('roles', trans('admin.roles'))->as(function ($roles) {
68
+        $show->field('roles', trans('admin.roles'))->as(function($roles) {
69 69
             return $roles->pluck('name');
70 70
         })->label();
71
-        $show->field('permissions', trans('admin.permissions'))->as(function ($permission) {
71
+        $show->field('permissions', trans('admin.permissions'))->as(function($permission) {
72 72
             return $permission->pluck('name');
73 73
         })->label();
74 74
         $show->field('created_at', trans('admin.created_at'));
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
         $form->image('avatar', trans('admin.avatar'));
102 102
         $form->password('password', trans('admin.password'))->rules('required|confirmed');
103 103
         $form->password('password_confirmation', trans('admin.password_confirmation'))->rules('required')
104
-            ->default(function ($form) {
104
+            ->default(function($form) {
105 105
                 return $form->model()->password;
106 106
             });
107 107
 
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
         $form->display('created_at', trans('admin.created_at'));
114 114
         $form->display('updated_at', trans('admin.updated_at'));
115 115
 
116
-        $form->saving(function (Form $form) {
116
+        $form->saving(function(Form $form) {
117 117
             if ($form->password && $form->model()->password != $form->password) {
118 118
                 $form->password = bcrypt($form->password);
119 119
             }
Please login to merge, or discard this patch.
src/Form/Field/Timezone.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@
 block discarded – undo
10 10
 
11 11
     public function render()
12 12
     {
13
-        $this->options = collect(DateTimeZone::listIdentifiers(DateTimeZone::ALL))->mapWithKeys(function ($timezone) {
13
+        $this->options = collect(DateTimeZone::listIdentifiers(DateTimeZone::ALL))->mapWithKeys(function($timezone) {
14 14
             return [$timezone => $timezone];
15 15
         })->toArray();
16 16
 
Please login to merge, or discard this patch.
src/Grid/Displayers/Button.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@
 block discarded – undo
6 6
 {
7 7
     public function display($style = null)
8 8
     {
9
-        $style = collect((array) $style)->map(function ($style) {
9
+        $style = collect((array) $style)->map(function($style) {
10 10
             return 'btn-'.$style;
11 11
         })->implode(' ');
12 12
 
Please login to merge, or discard this patch.
src/Grid/Displayers/Carousel.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
             return '';
21 21
         }
22 22
 
23
-        $images = collect((array) $this->value)->filter()->map(function ($path) use ($server) {
23
+        $images = collect((array) $this->value)->filter()->map(function($path) use ($server) {
24 24
             if (url()->isValidUrl($path) || strpos($path, 'data:image') === 0) {
25 25
                 $image = $path;
26 26
             } elseif ($server) {
Please login to merge, or discard this patch.
src/Grid/Displayers/ProgressBar.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@
 block discarded – undo
6 6
 {
7 7
     public function display($style = 'primary', $size = '', $max = 100)
8 8
     {
9
-        $style = collect((array) $style)->map(function ($style) {
9
+        $style = collect((array) $style)->map(function($style) {
10 10
             return 'progress-bar-'.$style;
11 11
         })->implode(' ');
12 12
 
Please login to merge, or discard this patch.
src/Grid/Tools/ColumnSelector.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 
39 39
         $show = $this->grid->visibleColumnNames();
40 40
 
41
-        $lists = $this->getGridColumns()->map(function ($label, $key) use ($show) {
41
+        $lists = $this->getGridColumns()->map(function($label, $key) use ($show) {
42 42
             if (empty($show)) {
43 43
                 $checked = 'checked';
44 44
             } else {
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
      */
91 91
     protected function getGridColumns()
92 92
     {
93
-        return $this->grid->columns()->map(function (Grid\Column $column) {
93
+        return $this->grid->columns()->map(function(Grid\Column $column) {
94 94
             $name = $column->getName();
95 95
 
96 96
             if (in_array($name, [Grid\Column::SELECT_COLUMN_NAME, Grid\Column::ACTION_COLUMN_NAME])) {
Please login to merge, or discard this patch.
src/Widgets/Form.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -294,7 +294,7 @@  discard block
 block discarded – undo
294 294
      */
295 295
     public function setWidth($fieldWidth = 8, $labelWidth = 2)
296 296
     {
297
-        collect($this->fields)->each(function ($field) use ($fieldWidth, $labelWidth) {
297
+        collect($this->fields)->each(function($field) use ($fieldWidth, $labelWidth) {
298 298
             /* @var Field $field  */
299 299
             $field->setWidth($fieldWidth, $labelWidth);
300 300
         });
@@ -475,7 +475,7 @@  discard block
 block discarded – undo
475 475
 
476 476
         $field = new $class($arguments[0], array_slice($arguments, 1));
477 477
 
478
-        return tap($field, function ($field) {
478
+        return tap($field, function($field) {
479 479
             $this->pushField($field);
480 480
         });
481 481
     }
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
@@ -72,8 +72,7 @@  discard block
 block discarded – undo
72 72
     {
73 73
         $columns = explode(',', request(ColumnSelector::SELECT_COLUMN_NAME));
74 74
 
75
-        return array_filter($columns) ?:
76
-            array_values(array_diff($this->columnNames, $this->hiddenColumns));
75
+        return array_filter($columns) ?: array_values(array_diff($this->columnNames, $this->hiddenColumns));
77 76
     }
78 77
 
79 78
     /**
@@ -91,7 +90,7 @@  discard block
 block discarded – undo
91 90
 
92 91
         array_push($visible, Grid\Column::SELECT_COLUMN_NAME, Grid\Column::ACTION_COLUMN_NAME);
93 92
 
94
-        return $this->columns->filter(function (Grid\Column $column) use ($visible) {
93
+        return $this->columns->filter(function(Grid\Column $column) use ($visible) {
95 94
             return in_array($column->getName(), $visible);
96 95
         });
97 96
     }
@@ -111,7 +110,7 @@  discard block
 block discarded – undo
111 110
 
112 111
         array_push($visible, Grid\Column::SELECT_COLUMN_NAME, Grid\Column::ACTION_COLUMN_NAME);
113 112
 
114
-        return collect($this->columnNames)->filter(function ($column) use ($visible) {
113
+        return collect($this->columnNames)->filter(function($column) use ($visible) {
115 114
             return in_array($column, $visible);
116 115
         })->toArray();
117 116
     }
Please login to merge, or discard this patch.