Completed
Pull Request — master (#2802)
by lingfeng
02:31
created
src/Grid/Filter.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
      */
241 241
     protected function removeFilterByID($id)
242 242
     {
243
-        $this->filters = array_filter($this->filters, function (AbstractFilter $filter) use ($id) {
243
+        $this->filters = array_filter($this->filters, function(AbstractFilter $filter) use ($id) {
244 244
             return $filter->getId() != $id;
245 245
         });
246 246
     }
@@ -254,7 +254,7 @@  discard block
 block discarded – undo
254 254
     {
255 255
         $inputs = array_dot(Input::all());
256 256
 
257
-        $inputs = array_filter($inputs, function ($input) {
257
+        $inputs = array_filter($inputs, function($input) {
258 258
             return $input !== '' && !is_null($input);
259 259
         });
260 260
 
@@ -278,7 +278,7 @@  discard block
 block discarded – undo
278 278
             $conditions[] = $filter->condition($params);
279 279
         }
280 280
 
281
-        return tap(array_filter($conditions), function ($conditions) {
281
+        return tap(array_filter($conditions), function($conditions) {
282 282
             if (!empty($conditions)) {
283 283
                 $this->expand();
284 284
             }
@@ -296,9 +296,9 @@  discard block
 block discarded – undo
296 296
             return $inputs;
297 297
         }
298 298
 
299
-        $inputs = collect($inputs)->filter(function ($input, $key) {
299
+        $inputs = collect($inputs)->filter(function($input, $key) {
300 300
             return starts_with($key, "{$this->name}_");
301
-        })->mapWithKeys(function ($val, $key) {
301
+        })->mapWithKeys(function($val, $key) {
302 302
             $key = str_replace("{$this->name}_", '', $key);
303 303
 
304 304
             return [$key => $val];
@@ -351,7 +351,7 @@  discard block
 block discarded – undo
351 351
      */
352 352
     public function scope($key, $label = '')
353 353
     {
354
-        return tap(new Scope($key, $label), function (Scope $scope) {
354
+        return tap(new Scope($key, $label), function(Scope $scope) {
355 355
             return $this->scopes->push($scope);
356 356
         });
357 357
     }
@@ -375,7 +375,7 @@  discard block
 block discarded – undo
375 375
     {
376 376
         $key = request(Scope::QUERY_NAME);
377 377
 
378
-        return $this->scopes->first(function ($scope) use ($key) {
378
+        return $this->scopes->first(function($scope) use ($key) {
379 379
             return $scope->key == $key;
380 380
         });
381 381
     }
@@ -495,9 +495,9 @@  discard block
 block discarded – undo
495 495
 
496 496
         $columns->push($pageKey);
497 497
 
498
-        $groupNames = collect($this->filters)->filter(function ($filter) {
498
+        $groupNames = collect($this->filters)->filter(function($filter) {
499 499
             return $filter instanceof Group;
500
-        })->map(function (AbstractFilter $filter) {
500
+        })->map(function(AbstractFilter $filter) {
501 501
             return "{$filter->getId()}_group";
502 502
         });
503 503
 
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
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
      */
180 180
     public function using(array $values, $default = null)
181 181
     {
182
-        return $this->as(function ($value) use ($values, $default) {
182
+        return $this->as(function($value) use ($values, $default) {
183 183
             if (is_null($value)) {
184 184
                 return $default;
185 185
             }
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
      */
200 200
     public function image($server = '', $width = 200, $height = 200)
201 201
     {
202
-        return $this->unescape()->as(function ($path) use ($server, $width, $height) {
202
+        return $this->unescape()->as(function($path) use ($server, $width, $height) {
203 203
             if (empty($path)) {
204 204
                 return '';
205 205
             }
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
234 234
     {
235 235
         $field = $this;
236 236
 
237
-        return $this->unescape()->as(function ($path) use ($server, $download, $field) {
237
+        return $this->unescape()->as(function($path) use ($server, $download, $field) {
238 238
             $name = basename($path);
239 239
 
240 240
             $field->wrapped = false;
@@ -282,7 +282,7 @@  discard block
 block discarded – undo
282 282
      */
283 283
     public function link($href = '', $target = '_blank')
284 284
     {
285
-        return $this->unescape()->as(function ($link) use ($href, $target) {
285
+        return $this->unescape()->as(function($link) use ($href, $target) {
286 286
             $href = $href ?: $link;
287 287
 
288 288
             return "<a href='$href' target='{$target}'>{$link}</a>";
@@ -298,12 +298,12 @@  discard block
 block discarded – undo
298 298
      */
299 299
     public function label($style = 'success')
300 300
     {
301
-        return $this->unescape()->as(function ($value) use ($style) {
301
+        return $this->unescape()->as(function($value) use ($style) {
302 302
             if ($value instanceof Arrayable) {
303 303
                 $value = $value->toArray();
304 304
             }
305 305
 
306
-            return collect((array) $value)->map(function ($name) use ($style) {
306
+            return collect((array) $value)->map(function($name) use ($style) {
307 307
                 return "<span class='label label-{$style}'>$name</span>";
308 308
             })->implode('&nbsp;');
309 309
         });
@@ -318,12 +318,12 @@  discard block
 block discarded – undo
318 318
      */
319 319
     public function badge($style = 'blue')
320 320
     {
321
-        return $this->unescape()->as(function ($value) use ($style) {
321
+        return $this->unescape()->as(function($value) use ($style) {
322 322
             if ($value instanceof Arrayable) {
323 323
                 $value = $value->toArray();
324 324
             }
325 325
 
326
-            return collect((array) $value)->map(function ($name) use ($style) {
326
+            return collect((array) $value)->map(function($name) use ($style) {
327 327
                 return "<span class='badge bg-{$style}'>$name</span>";
328 328
             })->implode('&nbsp;');
329 329
         });
@@ -338,7 +338,7 @@  discard block
 block discarded – undo
338 338
     {
339 339
         $field = $this;
340 340
 
341
-        return $this->unescape()->as(function ($value) use ($field) {
341
+        return $this->unescape()->as(function($value) use ($field) {
342 342
             $content = json_decode($value, true);
343 343
 
344 344
             if (json_last_error() == 0) {
@@ -474,7 +474,7 @@  discard block
 block discarded – undo
474 474
     public function render()
475 475
     {
476 476
         if ($this->showAs->isNotEmpty()) {
477
-            $this->showAs->each(function ($callable) {
477
+            $this->showAs->each(function($callable) {
478 478
                 $this->value = $callable->call(
479 479
                     $this->parent->getModel(),
480 480
                     $this->value
Please login to merge, or discard this patch.
src/Middleware/LogOperation.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -66,7 +66,7 @@
 block discarded – undo
66 66
             return true;
67 67
         }
68 68
 
69
-        return $allowedMethods->map(function ($method) {
69
+        return $allowedMethods->map(function($method) {
70 70
             return strtoupper($method);
71 71
         })->contains($method);
72 72
     }
Please login to merge, or discard this patch.
src/Grid/Displayers/SwitchDisplay.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@
 block discarded – undo
30 30
         if ($keys->isEmpty()) {
31 31
             $key = $name;
32 32
         } else {
33
-            $key = $keys->shift().$keys->reduce(function ($carry, $val) {
33
+            $key = $keys->shift().$keys->reduce(function($carry, $val) {
34 34
                 return $carry."[$val]";
35 35
             });
36 36
         }
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
@@ -30,7 +30,7 @@
 block discarded – undo
30 30
         if ($keys->isEmpty()) {
31 31
             $key = $name;
32 32
         } else {
33
-            $key = $keys->shift().$keys->reduce(function ($carry, $val) {
33
+            $key = $keys->shift().$keys->reduce(function($carry, $val) {
34 34
                 return $carry."[$val]";
35 35
             });
36 36
         }
Please login to merge, or discard this patch.
src/Grid.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -335,7 +335,7 @@  discard block
 block discarded – undo
335 335
         $column = new Column($column, $label);
336 336
         $column->setGrid($this);
337 337
 
338
-        return tap($column, function ($value) {
338
+        return tap($column, function($value) {
339 339
             $this->columns->push($value);
340 340
         });
341 341
     }
@@ -352,7 +352,7 @@  discard block
 block discarded – undo
352 352
         $column = new Column($column, $label);
353 353
         $column->setGrid($this);
354 354
 
355
-        return tap($column, function ($value) {
355
+        return tap($column, function($value) {
356 356
             $this->columns->prepend($value);
357 357
         });
358 358
     }
@@ -471,7 +471,7 @@  discard block
 block discarded – undo
471 471
      */
472 472
     public function disableRowSelector()
473 473
     {
474
-        $this->tools(function ($tools) {
474
+        $this->tools(function($tools) {
475 475
             /* @var Grid\Tools $tools */
476 476
             $tools->disableBatchActions();
477 477
         });
@@ -514,7 +514,7 @@  discard block
 block discarded – undo
514 514
 
515 515
         Column::setOriginalGridModels($collection);
516 516
 
517
-        $this->columns->map(function (Column $column) use (&$data) {
517
+        $this->columns->map(function(Column $column) use (&$data) {
518 518
             $data = $column->fill($data);
519 519
 
520 520
             $this->columnNames[] = $column->getName();
@@ -610,7 +610,7 @@  discard block
 block discarded – undo
610 610
      */
611 611
     protected function buildRows(array $data)
612 612
     {
613
-        $this->rows = collect($data)->map(function ($model, $number) {
613
+        $this->rows = collect($data)->map(function($model, $number) {
614 614
             return new Row($number, $model);
615 615
         });
616 616
 
Please login to merge, or discard this patch.
src/Grid/Column.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -316,7 +316,7 @@  discard block
 block discarded – undo
316 316
 
317 317
         $column = $this;
318 318
 
319
-        return $this->display(function ($value) use ($grid, $column, $abstract, $arguments) {
319
+        return $this->display(function($value) use ($grid, $column, $abstract, $arguments) {
320 320
             /** @var AbstractDisplayer $displayer */
321 321
             $displayer = new $abstract($value, $grid, $column, $this);
322 322
 
@@ -334,7 +334,7 @@  discard block
 block discarded – undo
334 334
      */
335 335
     public function using(array $values, $default = null)
336 336
     {
337
-        return $this->display(function ($value) use ($values, $default) {
337
+        return $this->display(function($value) use ($values, $default) {
338 338
             if (is_null($value)) {
339 339
                 return $default;
340 340
             }
@@ -352,7 +352,7 @@  discard block
 block discarded – undo
352 352
      */
353 353
     public function view($view)
354 354
     {
355
-        return $this->display(function ($value) use ($view) {
355
+        return $this->display(function($value) use ($view) {
356 356
             $model = $this;
357 357
 
358 358
             return view($view, compact('model', 'value'))->render();
@@ -475,7 +475,7 @@  discard block
 block discarded – undo
475 475
         $grid = $this->grid;
476 476
         $column = $this;
477 477
 
478
-        $this->display(function ($value) use ($grid, $column, $class) {
478
+        $this->display(function($value) use ($grid, $column, $class) {
479 479
             /** @var AbstractDisplayer $definition */
480 480
             $definition = new $class($value, $grid, $column, $this);
481 481
 
@@ -493,7 +493,7 @@  discard block
 block discarded – undo
493 493
     protected function htmlEntityEncode($item)
494 494
     {
495 495
         if (is_array($item)) {
496
-            array_walk_recursive($item, function (&$value) {
496
+            array_walk_recursive($item, function(&$value) {
497 497
                 $value = htmlentities($value);
498 498
             });
499 499
         } else {
@@ -573,7 +573,7 @@  discard block
 block discarded – undo
573 573
      */
574 574
     protected function callSupportDisplayer($abstract, $arguments)
575 575
     {
576
-        return $this->display(function ($value) use ($abstract, $arguments) {
576
+        return $this->display(function($value) use ($abstract, $arguments) {
577 577
             if (is_array($value) || $value instanceof Arrayable) {
578 578
                 return call_user_func_array([collect($value), $abstract], $arguments);
579 579
             }
@@ -597,7 +597,7 @@  discard block
 block discarded – undo
597 597
     protected function callBuiltinDisplayer($abstract, $arguments)
598 598
     {
599 599
         if ($abstract instanceof Closure) {
600
-            return $this->display(function ($value) use ($abstract, $arguments) {
600
+            return $this->display(function($value) use ($abstract, $arguments) {
601 601
                 return $abstract->call($this, ...array_merge([$value], $arguments));
602 602
             });
603 603
         }
@@ -606,7 +606,7 @@  discard block
 block discarded – undo
606 606
             $grid = $this->grid;
607 607
             $column = $this;
608 608
 
609
-            return $this->display(function ($value) use ($abstract, $grid, $column, $arguments) {
609
+            return $this->display(function($value) use ($abstract, $grid, $column, $arguments) {
610 610
                 /** @var AbstractDisplayer $displayer */
611 611
                 $displayer = new $abstract($value, $grid, $column, $this);
612 612
 
Please login to merge, or discard this patch.
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
             ->header(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/Form.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -291,7 +291,7 @@  discard block
 block discarded – undo
291 291
      */
292 292
     public function destroy($id)
293 293
     {
294
-        collect(explode(',', $id))->filter()->each(function ($id) {
294
+        collect(explode(',', $id))->filter()->each(function($id) {
295 295
             $builder = $this->model()->newQuery();
296 296
 
297 297
             if ($this->isSoftDeletes) {
@@ -329,9 +329,9 @@  discard block
 block discarded – undo
329 329
 
330 330
         $data = $model->toArray();
331 331
 
332
-        $this->builder->fields()->filter(function ($field) {
332
+        $this->builder->fields()->filter(function($field) {
333 333
             return $field instanceof Field\File;
334
-        })->each(function (Field\File $file) use ($data) {
334
+        })->each(function(Field\File $file) use ($data) {
335 335
             $file->setOriginal($data);
336 336
 
337 337
             $file->destroy();
@@ -356,7 +356,7 @@  discard block
 block discarded – undo
356 356
             return $response;
357 357
         }
358 358
 
359
-        DB::transaction(function () {
359
+        DB::transaction(function() {
360 360
             $inserts = $this->prepareInsert($this->updates);
361 361
 
362 362
             foreach ($inserts as $column => $value) {
@@ -559,7 +559,7 @@  discard block
 block discarded – undo
559 559
             return $response;
560 560
         }
561 561
 
562
-        DB::transaction(function () {
562
+        DB::transaction(function() {
563 563
             $updates = $this->prepareUpdate($this->updates);
564 564
 
565 565
             foreach ($updates as $column => $value) {
@@ -1028,7 +1028,7 @@  discard block
 block discarded – undo
1028 1028
     protected function getFieldByColumn($column)
1029 1029
     {
1030 1030
         return $this->builder->fields()->first(
1031
-            function (Field $field) use ($column) {
1031
+            function(Field $field) use ($column) {
1032 1032
                 if (is_array($field->column())) {
1033 1033
                     return in_array($column, $field->column());
1034 1034
                 }
@@ -1049,7 +1049,7 @@  discard block
 block discarded – undo
1049 1049
 
1050 1050
         $values = $this->model->toArray();
1051 1051
 
1052
-        $this->builder->fields()->each(function (Field $field) use ($values) {
1052
+        $this->builder->fields()->each(function(Field $field) use ($values) {
1053 1053
             $field->setOriginal($values);
1054 1054
         });
1055 1055
     }
@@ -1079,7 +1079,7 @@  discard block
 block discarded – undo
1079 1079
 
1080 1080
         $data = $this->model->toArray();
1081 1081
 
1082
-        $this->builder->fields()->each(function (Field $field) use ($data) {
1082
+        $this->builder->fields()->each(function(Field $field) use ($data) {
1083 1083
             if (!in_array($field->column(), $this->ignored)) {
1084 1084
                 $field->fill($data);
1085 1085
             }
@@ -1202,7 +1202,7 @@  discard block
 block discarded – undo
1202 1202
      */
1203 1203
     public function setWidth($fieldWidth = 8, $labelWidth = 2)
1204 1204
     {
1205
-        $this->builder()->fields()->each(function ($field) use ($fieldWidth, $labelWidth) {
1205
+        $this->builder()->fields()->each(function($field) use ($fieldWidth, $labelWidth) {
1206 1206
             /* @var Field $field  */
1207 1207
             $field->setWidth($fieldWidth, $labelWidth);
1208 1208
         });
Please login to merge, or discard this patch.