Completed
Pull Request — master (#5849)
by
unknown
39s
created
src/Grid/Concerns/HasQuickSearch.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
             $this->search = $search;
43 43
         }
44 44
 
45
-        return tap(new Tools\QuickSearch(), function ($search) {
45
+        return tap(new Tools\QuickSearch(), function($search) {
46 46
             $this->tools->append($search);
47 47
         });
48 48
     }
@@ -67,14 +67,14 @@  discard block
 block discarded – undo
67 67
         }
68 68
 
69 69
         if (is_array($this->search)) {
70
-            $this->model()->where(function (Builder $builder) use ($query) {
70
+            $this->model()->where(function(Builder $builder) use ($query) {
71 71
                 foreach ($this->search as $column) {
72 72
                     $this->addWhereLikeBinding($builder, $column, true, '%'.$query.'%');
73 73
                 }
74 74
             });
75 75
 
76 76
         } elseif (is_null($this->search)) {
77
-            $this->model()->where(function (Builder $builder) use ($query) {
77
+            $this->model()->where(function(Builder $builder) use ($query) {
78 78
                 $this->addWhereBindings($builder, $query);
79 79
             });
80 80
         }
@@ -132,14 +132,14 @@  discard block
 block discarded – undo
132 132
      */
133 133
     protected function parseQueryBindings(array $queries)
134 134
     {
135
-        $columnMap = $this->columns->mapWithKeys(function (Column $column) {
135
+        $columnMap = $this->columns->mapWithKeys(function(Column $column) {
136 136
             $label = $column->getLabel();
137 137
             $name = $column->getName();
138 138
 
139 139
             return [$label => $name, $name => $name];
140 140
         });
141 141
 
142
-        return collect($queries)->map(function ($query) use ($columnMap) {
142
+        return collect($queries)->map(function($query) use ($columnMap) {
143 143
             $segments = explode(':', $query, 2);
144 144
 
145 145
             if (count($segments) != 2) {
Please login to merge, or discard this patch.
src/Traits/HasAssets.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
         $script = collect(static::$script)
234 234
             ->merge(static::$deferredScript)
235 235
             ->unique()
236
-            ->map(function ($line) {
236
+            ->map(function($line) {
237 237
                 return $line;
238 238
                 //@see https://stackoverflow.com/questions/19509863/how-to-remove-js-comments-using-php
239 239
                 $pattern = '/(?:(?:\/\*(?:[^*]|(?:\*+[^*\/]))*\*+\/)|(?:(?<!\:|\\\|\')\/\/.*))/';
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
258 258
 
259 259
         $style = collect(static::$style)
260 260
             ->unique()
261
-            ->map(function ($line) {
261
+            ->map(function($line) {
262 262
                 return preg_replace('/\s+/', ' ', $line);
263 263
             });
264 264
 
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
@@ -33,9 +33,9 @@
 block discarded – undo
33 33
      */
34 34
     protected function getGridColumns()
35 35
     {
36
-        return $this->grid->columns()->reject(function ($column) {
36
+        return $this->grid->columns()->reject(function($column) {
37 37
             return in_array($column->getName(), static::$ignored);
38
-        })->map(function ($column) {
38
+        })->map(function($column) {
39 39
             return [$column->getName() => $column->getLabel()];
40 40
         })->collapse();
41 41
     }
Please login to merge, or discard this patch.
src/Grid/Displayers/AbstractDisplayer.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -123,7 +123,7 @@
 block discarded – undo
123 123
     {
124 124
         $keys = collect(explode('.', $name ?: $this->getName()));
125 125
 
126
-        return $keys->shift().$keys->reduce(function ($carry, $val) {
126
+        return $keys->shift().$keys->reduce(function($carry, $val) {
127 127
             return $carry."[$val]";
128 128
         });
129 129
     }
Please login to merge, or discard this patch.
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.