Completed
Pull Request — master (#4913)
by Song
07:48 queued 04:50
created
src/Controllers/RoleController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -36,14 +36,14 @@  discard block
 block discarded – undo
36 36
         $grid->column('created_at', trans('admin.created_at'));
37 37
         $grid->column('updated_at', trans('admin.updated_at'));
38 38
 
39
-        $grid->actions(function (Grid\Displayers\Actions $actions) {
39
+        $grid->actions(function(Grid\Displayers\Actions $actions) {
40 40
             if ($actions->row->slug == 'administrator') {
41 41
                 $actions->disableDelete();
42 42
             }
43 43
         });
44 44
 
45
-        $grid->tools(function (Grid\Tools $tools) {
46
-            $tools->batch(function (Grid\Tools\BatchActions $actions) {
45
+        $grid->tools(function(Grid\Tools $tools) {
46
+            $tools->batch(function(Grid\Tools\BatchActions $actions) {
47 47
                 $actions->disableDelete();
48 48
             });
49 49
         });
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
         $show->field('id', 'ID');
68 68
         $show->field('slug', trans('admin.slug'));
69 69
         $show->field('name', trans('admin.name'));
70
-        $show->field('permissions', trans('admin.permissions'))->as(function ($permission) {
70
+        $show->field('permissions', trans('admin.permissions'))->as(function($permission) {
71 71
             return $permission->pluck('name');
72 72
         })->label();
73 73
         $show->field('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
@@ -27,14 +27,14 @@  discard block
 block discarded – undo
27 27
 
28 28
         $grid->column('id', 'ID')->sortable();
29 29
         $grid->column('user.name', 'User');
30
-        $grid->column('method')->display(function ($method) {
30
+        $grid->column('method')->display(function($method) {
31 31
             $color = Arr::get(OperationLog::$methodColors, $method, 'grey');
32 32
 
33 33
             return "<span class=\"badge bg-$color\">$method</span>";
34 34
         });
35 35
         $grid->column('path')->label('info');
36 36
         $grid->column('ip')->label('primary');
37
-        $grid->column('input')->display(function ($input) {
37
+        $grid->column('input')->display(function($input) {
38 38
             $input = json_decode($input, true);
39 39
             $input = Arr::except($input, ['_pjax', '_token', '_method', '_previous_']);
40 40
             if (empty($input)) {
@@ -46,14 +46,14 @@  discard block
 block discarded – undo
46 46
 
47 47
         $grid->column('created_at', trans('admin.created_at'));
48 48
 
49
-        $grid->actions(function (Grid\Displayers\Actions $actions) {
49
+        $grid->actions(function(Grid\Displayers\Actions $actions) {
50 50
             $actions->disableEdit();
51 51
             $actions->disableView();
52 52
         });
53 53
 
54 54
         $grid->disableCreateButton();
55 55
 
56
-        $grid->filter(function (Grid\Filter $filter) {
56
+        $grid->filter(function(Grid\Filter $filter) {
57 57
             $userModel = config('admin.database.users_model');
58 58
 
59 59
             $filter->equal('user_id', 'User')->select($userModel::all()->pluck('name', 'id'));
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/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.
src/Grid/Tools.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
      */
85 85
     public function disableFilterButton(bool $disable = true)
86 86
     {
87
-        $this->tools = $this->tools->map(function ($tool) use ($disable) {
87
+        $this->tools = $this->tools->map(function($tool) use ($disable) {
88 88
             if ($tool instanceof FilterButton) {
89 89
                 return $tool->disable($disable);
90 90
             }
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
      */
113 113
     public function disableBatchActions(bool $disable = true)
114 114
     {
115
-        $this->tools = $this->tools->map(function ($tool) use ($disable) {
115
+        $this->tools = $this->tools->map(function($tool) use ($disable) {
116 116
             if ($tool instanceof BatchActions) {
117 117
                 return $tool->disable($disable);
118 118
             }
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
      */
127 127
     public function batch(\Closure $closure)
128 128
     {
129
-        call_user_func($closure, $this->tools->first(function ($tool) {
129
+        call_user_func($closure, $this->tools->first(function($tool) {
130 130
             return $tool instanceof BatchActions;
131 131
         }));
132 132
     }
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
      */
139 139
     public function render()
140 140
     {
141
-        return $this->tools->map(function ($tool) {
141
+        return $this->tools->map(function($tool) {
142 142
             if ($tool instanceof AbstractTool) {
143 143
                 if (!$tool->allowed()) {
144 144
                     return '';
Please login to merge, or discard this patch.
src/Show/Field.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
191 191
      */
192 192
     public function using(array $values, $default = null)
193 193
     {
194
-        return $this->as(function ($value) use ($values, $default) {
194
+        return $this->as(function($value) use ($values, $default) {
195 195
             if (is_null($value)) {
196 196
                 return $default;
197 197
             }
@@ -211,8 +211,8 @@  discard block
 block discarded – undo
211 211
      */
212 212
     public function image($server = '', $width = 200, $height = 200)
213 213
     {
214
-        return $this->unescape()->as(function ($images) use ($server, $width, $height) {
215
-            return collect($images)->map(function ($path) use ($server, $width, $height) {
214
+        return $this->unescape()->as(function($images) use ($server, $width, $height) {
215
+            return collect($images)->map(function($path) use ($server, $width, $height) {
216 216
                 if (empty($path)) {
217 217
                     return '';
218 218
                 }
@@ -247,8 +247,8 @@  discard block
 block discarded – undo
247 247
      */
248 248
     public function carousel($width = 300, $height = 200, $server = '')
249 249
     {
250
-        return $this->unescape()->as(function ($images) use ($server, $width, $height) {
251
-            $items = collect($images)->map(function ($path) use ($server, $width, $height) {
250
+        return $this->unescape()->as(function($images) use ($server, $width, $height) {
251
+            $items = collect($images)->map(function($path) use ($server, $width, $height) {
252 252
                 if (empty($path)) {
253 253
                     return '';
254 254
                 }
@@ -288,7 +288,7 @@  discard block
 block discarded – undo
288 288
     {
289 289
         $field = $this;
290 290
 
291
-        return $this->unescape()->as(function ($path) use ($server, $download, $field) {
291
+        return $this->unescape()->as(function($path) use ($server, $download, $field) {
292 292
             $name = basename($path);
293 293
 
294 294
             $field->border = false;
@@ -340,7 +340,7 @@  discard block
 block discarded – undo
340 340
      */
341 341
     public function link($href = '', $target = '_blank')
342 342
     {
343
-        return $this->unescape()->as(function ($link) use ($href, $target) {
343
+        return $this->unescape()->as(function($link) use ($href, $target) {
344 344
             $href = $href ?: $link;
345 345
 
346 346
             return "<a href='$href' target='{$target}'>{$link}</a>";
@@ -356,12 +356,12 @@  discard block
 block discarded – undo
356 356
      */
357 357
     public function label($style = 'success')
358 358
     {
359
-        return $this->unescape()->as(function ($value) use ($style) {
359
+        return $this->unescape()->as(function($value) use ($style) {
360 360
             if ($value instanceof Arrayable) {
361 361
                 $value = $value->toArray();
362 362
             }
363 363
 
364
-            return collect((array) $value)->map(function ($name) use ($style) {
364
+            return collect((array) $value)->map(function($name) use ($style) {
365 365
                 return "<span class='label label-{$style}'>$name</span>";
366 366
             })->implode('&nbsp;');
367 367
         });
@@ -376,12 +376,12 @@  discard block
 block discarded – undo
376 376
      */
377 377
     public function badge($style = 'blue')
378 378
     {
379
-        return $this->unescape()->as(function ($value) use ($style) {
379
+        return $this->unescape()->as(function($value) use ($style) {
380 380
             if ($value instanceof Arrayable) {
381 381
                 $value = $value->toArray();
382 382
             }
383 383
 
384
-            return collect((array) $value)->map(function ($name) use ($style) {
384
+            return collect((array) $value)->map(function($name) use ($style) {
385 385
                 return "<span class='badge bg-{$style}'>$name</span>";
386 386
             })->implode('&nbsp;');
387 387
         });
@@ -396,7 +396,7 @@  discard block
 block discarded – undo
396 396
     {
397 397
         $field = $this;
398 398
 
399
-        return $this->unescape()->as(function ($value) use ($field) {
399
+        return $this->unescape()->as(function($value) use ($field) {
400 400
             $content = json_decode($value, true);
401 401
 
402 402
             if (json_last_error() == 0) {
@@ -416,7 +416,7 @@  discard block
 block discarded – undo
416 416
      */
417 417
     public function filesize()
418 418
     {
419
-        return $this->as(function ($value) {
419
+        return $this->as(function($value) {
420 420
             return file_size($value);
421 421
         });
422 422
     }
@@ -555,7 +555,7 @@  discard block
 block discarded – undo
555 555
 
556 556
         $field = $this;
557 557
 
558
-        return $this->as(function ($value) use ($extend, $field, $arguments) {
558
+        return $this->as(function($value) use ($extend, $field, $arguments) {
559 559
             if (!$extend->border) {
560 560
                 $field->border = false;
561 561
             }
@@ -614,7 +614,7 @@  discard block
 block discarded – undo
614 614
     public function render()
615 615
     {
616 616
         if ($this->showAs->isNotEmpty()) {
617
-            $this->showAs->each(function ($callable) {
617
+            $this->showAs->each(function($callable) {
618 618
                 $this->value = $callable->call(
619 619
                     $this->parent->getModel(),
620 620
                     $this->value
Please login to merge, or discard this patch.