Completed
Pull Request — master (#2447)
by jxlwqq
03:41
created
src/Console/AdminCommand.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@
 block discarded – undo
56 56
      */
57 57
     protected function listAdminCommands()
58 58
     {
59
-        $commands = collect(Artisan::all())->mapWithKeys(function ($command, $key) {
59
+        $commands = collect(Artisan::all())->mapWithKeys(function($command, $key) {
60 60
             if (Str::startsWith($key, 'admin:')) {
61 61
                 return [$key => $command];
62 62
             }
Please login to merge, or discard this patch.
src/Form/Tab.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
         $all = $fields->toArray();
71 71
 
72 72
         foreach ($this->form->rows as $row) {
73
-            $rowFields = array_map(function ($field) {
73
+            $rowFields = array_map(function($field) {
74 74
                 return $field['element'];
75 75
             }, $row->getFields());
76 76
 
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
     public function getTabs()
105 105
     {
106 106
         // If there is no active tab, then active the first.
107
-        if ($this->tabs->filter(function ($tab) {
107
+        if ($this->tabs->filter(function($tab) {
108 108
             return $tab['active'];
109 109
         })->isEmpty()) {
110 110
             $first = $this->tabs->first();
Please login to merge, or discard this patch.
src/Grid/Filter.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
     {
226 226
         $inputs = array_dot(Input::all());
227 227
 
228
-        $inputs = array_filter($inputs, function ($input) {
228
+        $inputs = array_filter($inputs, function($input) {
229 229
             return $input !== '' && !is_null($input);
230 230
         });
231 231
 
@@ -249,7 +249,7 @@  discard block
 block discarded – undo
249 249
             $conditions[] = $filter->condition($params);
250 250
         }
251 251
 
252
-        return tap(array_filter($conditions), function ($conditions) {
252
+        return tap(array_filter($conditions), function($conditions) {
253 253
             if (!empty($conditions)) {
254 254
                 $this->expand();
255 255
             }
@@ -267,9 +267,9 @@  discard block
 block discarded – undo
267 267
             return $inputs;
268 268
         }
269 269
 
270
-        $inputs = collect($inputs)->filter(function ($input, $key) {
270
+        $inputs = collect($inputs)->filter(function($input, $key) {
271 271
             return starts_with($key, "{$this->name}_");
272
-        })->mapWithKeys(function ($val, $key) {
272
+        })->mapWithKeys(function($val, $key) {
273 273
             $key = str_replace("{$this->name}_", '', $key);
274 274
 
275 275
             return [$key => $val];
@@ -322,7 +322,7 @@  discard block
 block discarded – undo
322 322
      */
323 323
     public function scope($key, $label = '')
324 324
     {
325
-        return tap(new Scope($key, $label), function (Scope $scope) {
325
+        return tap(new Scope($key, $label), function(Scope $scope) {
326 326
             return $this->scopes->push($scope);
327 327
         });
328 328
     }
@@ -346,7 +346,7 @@  discard block
 block discarded – undo
346 346
     {
347 347
         $key = request(Scope::QUERY_NAME);
348 348
 
349
-        return $this->scopes->first(function ($scope) use ($key) {
349
+        return $this->scopes->first(function($scope) use ($key) {
350 350
             return $scope->key == $key;
351 351
         });
352 352
     }
@@ -461,9 +461,9 @@  discard block
 block discarded – undo
461 461
 
462 462
         $columns->push($pageKey);
463 463
 
464
-        $groupNames = collect($this->filters)->filter(function ($filter) {
464
+        $groupNames = collect($this->filters)->filter(function($filter) {
465 465
             return $filter instanceof Group;
466
-        })->map(function (AbstractFilter $filter) {
466
+        })->map(function(AbstractFilter $filter) {
467 467
             return "{$filter->getId()}_group";
468 468
         });
469 469
 
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
@@ -312,7 +312,7 @@  discard block
 block discarded – undo
312 312
      */
313 313
     public function using(array $values, $default = null)
314 314
     {
315
-        return $this->display(function ($value) use ($values, $default) {
315
+        return $this->display(function($value) use ($values, $default) {
316 316
             if (is_null($value)) {
317 317
                 return $default;
318 318
             }
@@ -330,7 +330,7 @@  discard block
 block discarded – undo
330 330
      */
331 331
     public function view($view)
332 332
     {
333
-        return $this->display(function ($value) use ($view) {
333
+        return $this->display(function($value) use ($view) {
334 334
             $model = $this;
335 335
 
336 336
             return view($view, compact('model', 'value'))->render();
@@ -452,7 +452,7 @@  discard block
 block discarded – undo
452 452
         $grid = $this->grid;
453 453
         $column = $this;
454 454
 
455
-        $this->display(function ($value) use ($grid, $column, $class) {
455
+        $this->display(function($value) use ($grid, $column, $class) {
456 456
             /** @var AbstractDisplayer $definition */
457 457
             $definition = new $class($value, $grid, $column, $this);
458 458
 
@@ -470,7 +470,7 @@  discard block
 block discarded – undo
470 470
     protected function htmlEntityEncode($item)
471 471
     {
472 472
         if (is_array($item)) {
473
-            array_walk_recursive($item, function (&$value) {
473
+            array_walk_recursive($item, function(&$value) {
474 474
                 $value = htmlentities($value);
475 475
             });
476 476
         } else {
@@ -550,7 +550,7 @@  discard block
 block discarded – undo
550 550
      */
551 551
     protected function callSupportDisplayer($abstract, $arguments)
552 552
     {
553
-        return $this->display(function ($value) use ($abstract, $arguments) {
553
+        return $this->display(function($value) use ($abstract, $arguments) {
554 554
             if (is_array($value) || $value instanceof Arrayable) {
555 555
                 return call_user_func_array([collect($value), $abstract], $arguments);
556 556
             }
@@ -574,7 +574,7 @@  discard block
 block discarded – undo
574 574
     protected function callBuiltinDisplayer($abstract, $arguments)
575 575
     {
576 576
         if ($abstract instanceof Closure) {
577
-            return $this->display(function ($value) use ($abstract, $arguments) {
577
+            return $this->display(function($value) use ($abstract, $arguments) {
578 578
                 return $abstract->call($this, ...array_merge([$value], $arguments));
579 579
             });
580 580
         }
@@ -583,7 +583,7 @@  discard block
 block discarded – undo
583 583
             $grid = $this->grid;
584 584
             $column = $this;
585 585
 
586
-            return $this->display(function ($value) use ($abstract, $grid, $column, $arguments) {
586
+            return $this->display(function($value) use ($abstract, $grid, $column, $arguments) {
587 587
                 $displayer = new $abstract($value, $grid, $column, $this);
588 588
 
589 589
                 return $displayer->display(...$arguments);
Please login to merge, or discard this patch.
src/Show/Field.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
      */
173 173
     public function using(array $values, $default = null)
174 174
     {
175
-        return $this->as(function ($value) use ($values, $default) {
175
+        return $this->as(function($value) use ($values, $default) {
176 176
             if (is_null($value)) {
177 177
                 return $default;
178 178
             }
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
      */
193 193
     public function image($server = '', $width = 200, $height = 200)
194 194
     {
195
-        return $this->as(function ($path) use ($server, $width, $height) {
195
+        return $this->as(function($path) use ($server, $width, $height) {
196 196
             if (empty($path)) {
197 197
                 return '';
198 198
             }
@@ -227,7 +227,7 @@  discard block
 block discarded – undo
227 227
     {
228 228
         $field = $this;
229 229
 
230
-        return $this->as(function ($path) use ($server, $download, $field) {
230
+        return $this->as(function($path) use ($server, $download, $field) {
231 231
             $name = basename($path);
232 232
 
233 233
             $field->wrapped = false;
@@ -275,7 +275,7 @@  discard block
 block discarded – undo
275 275
      */
276 276
     public function link($href = '', $target = '_blank')
277 277
     {
278
-        return $this->as(function ($link) use ($href, $target) {
278
+        return $this->as(function($link) use ($href, $target) {
279 279
             $href = $href ?: $link;
280 280
 
281 281
             return "<a href='$href' target='{$target}'>{$link}</a>";
@@ -291,12 +291,12 @@  discard block
 block discarded – undo
291 291
      */
292 292
     public function label($style = 'success')
293 293
     {
294
-        return $this->as(function ($value) use ($style) {
294
+        return $this->as(function($value) use ($style) {
295 295
             if ($value instanceof Arrayable) {
296 296
                 $value = $value->toArray();
297 297
             }
298 298
 
299
-            return collect((array) $value)->map(function ($name) use ($style) {
299
+            return collect((array) $value)->map(function($name) use ($style) {
300 300
                 return "<span class='label label-{$style}'>$name</span>";
301 301
             })->implode('&nbsp;');
302 302
         });
@@ -311,12 +311,12 @@  discard block
 block discarded – undo
311 311
      */
312 312
     public function badge($style = 'blue')
313 313
     {
314
-        return $this->as(function ($value) use ($style) {
314
+        return $this->as(function($value) use ($style) {
315 315
             if ($value instanceof Arrayable) {
316 316
                 $value = $value->toArray();
317 317
             }
318 318
 
319
-            return collect((array) $value)->map(function ($name) use ($style) {
319
+            return collect((array) $value)->map(function($name) use ($style) {
320 320
                 return "<span class='badge bg-{$style}'>$name</span>";
321 321
             })->implode('&nbsp;');
322 322
         });
@@ -331,7 +331,7 @@  discard block
 block discarded – undo
331 331
     {
332 332
         $field = $this;
333 333
 
334
-        return $this->as(function ($value) use ($field) {
334
+        return $this->as(function($value) use ($field) {
335 335
             $content = json_decode($value, true);
336 336
 
337 337
             if (json_last_error() == 0) {
@@ -442,7 +442,7 @@  discard block
 block discarded – undo
442 442
     public function render()
443 443
     {
444 444
         if ($this->showAs->isNotEmpty()) {
445
-            $this->showAs->each(function ($callable) {
445
+            $this->showAs->each(function($callable) {
446 446
                 $this->value = $callable->call(
447 447
                     $this->parent->getModel(),
448 448
                     $this->value
Please login to merge, or discard this patch.
src/Grid/Filter/Presenter/Select.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -105,7 +105,7 @@
 block discarded – undo
105 105
             throw new \InvalidArgumentException("[$model] must be a valid model class");
106 106
         }
107 107
 
108
-        $this->options = function ($value) use ($model, $idField, $textField) {
108
+        $this->options = function($value) use ($model, $idField, $textField) {
109 109
             if (empty($value)) {
110 110
                 return [];
111 111
             }
Please login to merge, or discard this patch.
src/Form/Field/Select.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -105,7 +105,7 @@
 block discarded – undo
105 105
             throw new \InvalidArgumentException("[$model] must be a valid model class");
106 106
         }
107 107
 
108
-        $this->options = function ($value) use ($model, $idField, $textField) {
108
+        $this->options = function($value) use ($model, $idField, $textField) {
109 109
             if (empty($value)) {
110 110
                 return [];
111 111
             }
Please login to merge, or discard this patch.
src/Middleware/Bootstrap.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
             require $bootstrap;
20 20
         }
21 21
 
22
-        if (! empty(Admin::$booting)) {
22
+        if (!empty(Admin::$booting)) {
23 23
             foreach (Admin::$booting as $callable) {
24 24
                 call_user_func($callable);
25 25
             }
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 
28 28
         $this->injectFormAssets();
29 29
 
30
-        if (! empty(Admin::$booted)) {
30
+        if (!empty(Admin::$booted)) {
31 31
             foreach (Admin::$booted as $callable) {
32 32
                 call_user_func($callable);
33 33
             }
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
@@ -279,7 +279,7 @@  discard block
 block discarded – undo
279 279
     {
280 280
         $ids = explode(',', $id);
281 281
 
282
-        collect($ids)->filter()->each(function ($id) {
282
+        collect($ids)->filter()->each(function($id) {
283 283
             $this->deleteFiles($id);
284 284
             $this->model()->find($id)->delete();
285 285
         });
@@ -304,9 +304,9 @@  discard block
 block discarded – undo
304 304
             ->with($this->getRelations())
305 305
             ->findOrFail($id)->toArray();
306 306
 
307
-        $this->builder->fields()->filter(function ($field) {
307
+        $this->builder->fields()->filter(function($field) {
308 308
             return $field instanceof Field\File;
309
-        })->each(function (Field\File $file) use ($data) {
309
+        })->each(function(Field\File $file) use ($data) {
310 310
             $file->setOriginal($data);
311 311
 
312 312
             $file->destroy();
@@ -331,7 +331,7 @@  discard block
 block discarded – undo
331 331
             return $response;
332 332
         }
333 333
 
334
-        DB::transaction(function () {
334
+        DB::transaction(function() {
335 335
             $inserts = $this->prepareInsert($this->updates);
336 336
 
337 337
             foreach ($inserts as $column => $value) {
@@ -522,7 +522,7 @@  discard block
 block discarded – undo
522 522
             return $response;
523 523
         }
524 524
 
525
-        DB::transaction(function () {
525
+        DB::transaction(function() {
526 526
             $updates = $this->prepareUpdate($this->updates);
527 527
 
528 528
             foreach ($updates as $column => $value) {
@@ -957,7 +957,7 @@  discard block
 block discarded – undo
957 957
     protected function getFieldByColumn($column)
958 958
     {
959 959
         return $this->builder->fields()->first(
960
-            function (Field $field) use ($column) {
960
+            function(Field $field) use ($column) {
961 961
                 if (is_array($field->column())) {
962 962
                     return in_array($column, $field->column());
963 963
                 }
@@ -978,7 +978,7 @@  discard block
 block discarded – undo
978 978
 
979 979
         $values = $this->model->toArray();
980 980
 
981
-        $this->builder->fields()->each(function (Field $field) use ($values) {
981
+        $this->builder->fields()->each(function(Field $field) use ($values) {
982 982
             $field->setOriginal($values);
983 983
         });
984 984
     }
@@ -1000,7 +1000,7 @@  discard block
 block discarded – undo
1000 1000
 
1001 1001
         $data = $this->model->toArray();
1002 1002
 
1003
-        $this->builder->fields()->each(function (Field $field) use ($data) {
1003
+        $this->builder->fields()->each(function(Field $field) use ($data) {
1004 1004
             if (!in_array($field->column(), $this->ignored)) {
1005 1005
                 $field->fill($data);
1006 1006
             }
@@ -1123,7 +1123,7 @@  discard block
 block discarded – undo
1123 1123
      */
1124 1124
     public function setWidth($fieldWidth = 8, $labelWidth = 2)
1125 1125
     {
1126
-        $this->builder()->fields()->each(function ($field) use ($fieldWidth, $labelWidth) {
1126
+        $this->builder()->fields()->each(function($field) use ($fieldWidth, $labelWidth) {
1127 1127
             /* @var Field $field  */
1128 1128
             $field->setWidth($fieldWidth, $labelWidth);
1129 1129
         });
@@ -1384,7 +1384,7 @@  discard block
 block discarded – undo
1384 1384
      */
1385 1385
     public static function alias($field, $alias)
1386 1386
     {
1387
-        static::$fieldAlias[$alias] =  $field;
1387
+        static::$fieldAlias[$alias] = $field;
1388 1388
     }
1389 1389
 
1390 1390
     /**
Please login to merge, or discard this patch.