Completed
Pull Request — master (#2629)
by jxlwqq
02:27
created
src/Grid/Filter/Layout/Column.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -73,7 +73,7 @@
 block discarded – undo
73 73
      */
74 74
     public function removeFilterByID($id)
75 75
     {
76
-        $this->filters = $this->filters->reject(function (AbstractFilter $filter) use ($id) {
76
+        $this->filters = $this->filters->reject(function(AbstractFilter $filter) use ($id) {
77 77
             return $filter->getId() == $id;
78 78
         });
79 79
     }
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
@@ -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/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/Column.php 2 patches
Doc Comments   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
     /**
126 126
      * Extend column displayer.
127 127
      *
128
-     * @param $name
128
+     * @param string $name
129 129
      * @param $displayer
130 130
      */
131 131
     public static function extend($name, $displayer)
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
     /**
160 160
      * Set model for column.
161 161
      *
162
-     * @param $model
162
+     * @param Model $model
163 163
      */
164 164
     public function setModel($model)
165 165
     {
@@ -219,7 +219,7 @@  discard block
 block discarded – undo
219 219
     /**
220 220
      * Get name of this column.
221 221
      *
222
-     * @return mixed
222
+     * @return string
223 223
      */
224 224
     public function getName()
225 225
     {
@@ -229,7 +229,7 @@  discard block
 block discarded – undo
229 229
     /**
230 230
      * Format label.
231 231
      *
232
-     * @param $label
232
+     * @param string $label
233 233
      *
234 234
      * @return mixed
235 235
      */
@@ -243,7 +243,7 @@  discard block
 block discarded – undo
243 243
     /**
244 244
      * Get label of the column.
245 245
      *
246
-     * @return mixed
246
+     * @return string
247 247
      */
248 248
     public function getLabel()
249 249
     {
@@ -306,7 +306,7 @@  discard block
 block discarded – undo
306 306
      * Display using display abstract.
307 307
      *
308 308
      * @param string $abstract
309
-     * @param array  $arguments
309
+     * @param Closure[]  $arguments
310 310
      *
311 311
      * @return Column
312 312
      */
Please login to merge, or discard this 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/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.