Completed
Pull Request — master (#3063)
by jxlwqq
02:22
created
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.
src/Controllers/LogController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -35,14 +35,14 @@  discard block
 block discarded – undo
35 35
 
36 36
         $grid->id('ID')->sortable();
37 37
         $grid->user()->name('User');
38
-        $grid->method()->display(function ($method) {
38
+        $grid->method()->display(function($method) {
39 39
             $color = array_get(OperationLog::$methodColors, $method, 'grey');
40 40
 
41 41
             return "<span class=\"badge bg-$color\">$method</span>";
42 42
         });
43 43
         $grid->path()->label('info');
44 44
         $grid->ip()->label('primary');
45
-        $grid->input()->display(function ($input) {
45
+        $grid->input()->display(function($input) {
46 46
             $input = json_decode($input, true);
47 47
             $input = array_except($input, ['_pjax', '_token', '_method', '_previous_']);
48 48
             if (empty($input)) {
@@ -54,14 +54,14 @@  discard block
 block discarded – undo
54 54
 
55 55
         $grid->created_at(trans('admin.created_at'));
56 56
 
57
-        $grid->actions(function (Grid\Displayers\Actions $actions) {
57
+        $grid->actions(function(Grid\Displayers\Actions $actions) {
58 58
             $actions->disableEdit();
59 59
             $actions->disableView();
60 60
         });
61 61
 
62 62
         $grid->disableCreation();
63 63
 
64
-        $grid->filter(function ($filter) {
64
+        $grid->filter(function($filter) {
65 65
             $userModel = config('admin.database.users_model');
66 66
 
67 67
             $filter->equal('user_id', 'User')->select($userModel::all()->pluck('name', 'id'));
Please login to merge, or discard this patch.
src/Admin.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -213,10 +213,10 @@
 block discarded – undo
213 213
             'middleware' => config('admin.route.middleware'),
214 214
         ];
215 215
 
216
-        app('router')->group($attributes, function ($router) {
216
+        app('router')->group($attributes, function($router) {
217 217
 
218 218
             /* @var \Illuminate\Routing\Router $router */
219
-            $router->namespace('Encore\Admin\Controllers')->group(function ($router) {
219
+            $router->namespace('Encore\Admin\Controllers')->group(function($router) {
220 220
 
221 221
                 /* @var \Illuminate\Routing\Router $router */
222 222
                 $router->resource('auth/users', 'UserController');
Please login to merge, or discard this patch.
src/Grid/Displayers/Image.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@
 block discarded – undo
13 13
             $this->value = $this->value->toArray();
14 14
         }
15 15
 
16
-        return collect((array) $this->value)->filter()->map(function ($path) use ($server, $width, $height) {
16
+        return collect((array) $this->value)->filter()->map(function($path) use ($server, $width, $height) {
17 17
             if (url()->isValidUrl($path) || strpos($path, 'data:image') === 0) {
18 18
                 $src = $path;
19 19
             } elseif ($server) {
Please login to merge, or discard this patch.
src/Form/Field/UploadField.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@
 block discarded – undo
79 79
             'browseLabel'          => trans('admin.browse'),
80 80
             'showRemove'           => false,
81 81
             'showUpload'           => false,
82
-            'dropZoneEnabled'      => false,        //dropzone disabled by default for backward compatibility
82
+            'dropZoneEnabled'      => false, //dropzone disabled by default for backward compatibility
83 83
 //            'initialCaption'       => $this->initialCaption($this->value),
84 84
             'deleteExtraData'      => [
85 85
                 $this->formatName($this->column) => static::FILE_DELETE_FLAG,
Please login to merge, or discard this patch.
src/Grid/Filter.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -259,7 +259,7 @@  discard block
 block discarded – undo
259 259
      */
260 260
     protected function removeFilterByID($id)
261 261
     {
262
-        $this->filters = array_filter($this->filters, function (AbstractFilter $filter) use ($id) {
262
+        $this->filters = array_filter($this->filters, function(AbstractFilter $filter) use ($id) {
263 263
             return $filter->getId() != $id;
264 264
         });
265 265
     }
@@ -273,7 +273,7 @@  discard block
 block discarded – undo
273 273
     {
274 274
         $inputs = array_dot(Input::all());
275 275
 
276
-        $inputs = array_filter($inputs, function ($input) {
276
+        $inputs = array_filter($inputs, function($input) {
277 277
             return $input !== '' && !is_null($input);
278 278
         });
279 279
 
@@ -301,7 +301,7 @@  discard block
 block discarded – undo
301 301
             }
302 302
         }
303 303
 
304
-        return tap(array_filter($conditions), function ($conditions) {
304
+        return tap(array_filter($conditions), function($conditions) {
305 305
             if (!empty($conditions)) {
306 306
                 $this->expand();
307 307
             }
@@ -319,9 +319,9 @@  discard block
 block discarded – undo
319 319
             return $inputs;
320 320
         }
321 321
 
322
-        $inputs = collect($inputs)->filter(function ($input, $key) {
322
+        $inputs = collect($inputs)->filter(function($input, $key) {
323 323
             return starts_with($key, "{$this->name}_");
324
-        })->mapWithKeys(function ($val, $key) {
324
+        })->mapWithKeys(function($val, $key) {
325 325
             $key = str_replace("{$this->name}_", '', $key);
326 326
 
327 327
             return [$key => $val];
@@ -391,7 +391,7 @@  discard block
 block discarded – undo
391 391
      */
392 392
     public function scope($key, $label = '')
393 393
     {
394
-        return tap(new Scope($key, $label), function (Scope $scope) {
394
+        return tap(new Scope($key, $label), function(Scope $scope) {
395 395
             return $this->scopes->push($scope);
396 396
         });
397 397
     }
@@ -415,7 +415,7 @@  discard block
 block discarded – undo
415 415
     {
416 416
         $key = request(Scope::QUERY_NAME);
417 417
 
418
-        return $this->scopes->first(function ($scope) use ($key) {
418
+        return $this->scopes->first(function($scope) use ($key) {
419 419
             return $scope->key == $key;
420 420
         });
421 421
     }
@@ -535,9 +535,9 @@  discard block
 block discarded – undo
535 535
 
536 536
         $columns->push($pageKey);
537 537
 
538
-        $groupNames = collect($this->filters)->filter(function ($filter) {
538
+        $groupNames = collect($this->filters)->filter(function($filter) {
539 539
             return $filter instanceof Group;
540
-        })->map(function (AbstractFilter $filter) {
540
+        })->map(function(AbstractFilter $filter) {
541 541
             return "{$filter->getId()}_group";
542 542
         });
543 543
 
Please login to merge, or discard this patch.
src/Grid/Displayers/Editable.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -184,7 +184,7 @@
 block discarded – undo
184 184
             $attributes = array_merge($attributes, $this->attributes);
185 185
         }
186 186
 
187
-        $attributes = collect($attributes)->map(function ($attribute, $name) {
187
+        $attributes = collect($attributes)->map(function($attribute, $name) {
188 188
             return "$name='$attribute'";
189 189
         })->implode(' ');
190 190
 
Please login to merge, or discard this patch.