Completed
Pull Request — master (#2576)
by jxlwqq
03:07
created
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/Grid.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -431,7 +431,7 @@  discard block
 block discarded – undo
431 431
         $callback = $this->actionsCallback;
432 432
         $column = $this->addColumn('__actions__', trans('admin.action'));
433 433
 
434
-        $column->display(function ($value) use ($grid, $column, $callback) {
434
+        $column->display(function($value) use ($grid, $column, $callback) {
435 435
             $actions = new Displayers\Actions($value, $grid, $column, $this);
436 436
 
437 437
             return $actions->display($callback);
@@ -445,7 +445,7 @@  discard block
 block discarded – undo
445 445
      */
446 446
     public function disableRowSelector()
447 447
     {
448
-        $this->tools(function ($tools) {
448
+        $this->tools(function($tools) {
449 449
             /* @var Grid\Tools $tools */
450 450
             $tools->disableBatchActions();
451 451
         });
@@ -469,7 +469,7 @@  discard block
 block discarded – undo
469 469
         $column = new Column(Column::SELECT_COLUMN_NAME, ' ');
470 470
         $column->setGrid($this);
471 471
 
472
-        $column->display(function ($value) use ($grid, $column) {
472
+        $column->display(function($value) use ($grid, $column) {
473 473
             $actions = new Displayers\RowSelector($value, $grid, $column, $this);
474 474
 
475 475
             return $actions->display();
@@ -498,7 +498,7 @@  discard block
 block discarded – undo
498 498
 
499 499
         Column::setOriginalGridModels($collection);
500 500
 
501
-        $this->columns->map(function (Column $column) use (&$data) {
501
+        $this->columns->map(function(Column $column) use (&$data) {
502 502
             $data = $column->fill($data);
503 503
 
504 504
             $this->columnNames[] = $column->getName();
@@ -593,7 +593,7 @@  discard block
 block discarded – undo
593 593
      */
594 594
     protected function buildRows(array $data)
595 595
     {
596
-        $this->rows = collect($data)->map(function ($model, $number) {
596
+        $this->rows = collect($data)->map(function($model, $number) {
597 597
             return new Row($number, $model);
598 598
         });
599 599
 
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();
@@ -453,7 +453,7 @@  discard block
 block discarded – undo
453 453
         $grid = $this->grid;
454 454
         $column = $this;
455 455
 
456
-        $this->display(function ($value) use ($grid, $column, $class) {
456
+        $this->display(function($value) use ($grid, $column, $class) {
457 457
             /** @var AbstractDisplayer $definition */
458 458
             $definition = new $class($value, $grid, $column, $this);
459 459
 
@@ -471,7 +471,7 @@  discard block
 block discarded – undo
471 471
     protected function htmlEntityEncode($item)
472 472
     {
473 473
         if (is_array($item)) {
474
-            array_walk_recursive($item, function (&$value) {
474
+            array_walk_recursive($item, function(&$value) {
475 475
                 $value = htmlentities($value);
476 476
             });
477 477
         } else {
@@ -551,7 +551,7 @@  discard block
 block discarded – undo
551 551
      */
552 552
     protected function callSupportDisplayer($abstract, $arguments)
553 553
     {
554
-        return $this->display(function ($value) use ($abstract, $arguments) {
554
+        return $this->display(function($value) use ($abstract, $arguments) {
555 555
             if (is_array($value) || $value instanceof Arrayable) {
556 556
                 return call_user_func_array([collect($value), $abstract], $arguments);
557 557
             }
@@ -575,7 +575,7 @@  discard block
 block discarded – undo
575 575
     protected function callBuiltinDisplayer($abstract, $arguments)
576 576
     {
577 577
         if ($abstract instanceof Closure) {
578
-            return $this->display(function ($value) use ($abstract, $arguments) {
578
+            return $this->display(function($value) use ($abstract, $arguments) {
579 579
                 return $abstract->call($this, ...array_merge([$value], $arguments));
580 580
             });
581 581
         }
@@ -584,7 +584,7 @@  discard block
 block discarded – undo
584 584
             $grid = $this->grid;
585 585
             $column = $this;
586 586
 
587
-            return $this->display(function ($value) use ($abstract, $grid, $column, $arguments) {
587
+            return $this->display(function($value) use ($abstract, $grid, $column, $arguments) {
588 588
                 /** @var AbstractDisplayer $displayer */
589 589
                 $displayer = new $abstract($value, $grid, $column, $this);
590 590
 
Please login to merge, or discard this patch.
src/Grid/Model.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -311,9 +311,9 @@  discard block
 block discarded – undo
311 311
 
312 312
         $this->setSort();
313 313
 
314
-        $this->queries->reject(function ($query) {
314
+        $this->queries->reject(function($query) {
315 315
             return $query['method'] == 'paginate';
316
-        })->each(function ($query) {
316
+        })->each(function($query) {
317 317
             $this->model = $this->model->{$query['method']}(...$query['arguments']);
318 318
         });
319 319
 
@@ -364,7 +364,7 @@  discard block
 block discarded – undo
364 364
         $this->setSort();
365 365
         $this->setPaginate();
366 366
 
367
-        $this->queries->unique()->each(function ($query) {
367
+        $this->queries->unique()->each(function($query) {
368 368
             $this->model = call_user_func_array([$this->model, $query['method']], $query['arguments']);
369 369
         });
370 370
 
@@ -394,9 +394,9 @@  discard block
 block discarded – undo
394 394
 
395 395
         $queryBuilder = $this->originalModel;
396 396
 
397
-        $this->queries->reject(function ($query) {
397
+        $this->queries->reject(function($query) {
398 398
             return in_array($query['method'], ['get', 'paginate']);
399
-        })->each(function ($query) use (&$queryBuilder) {
399
+        })->each(function($query) use (&$queryBuilder) {
400 400
             $queryBuilder = $queryBuilder->{$query['method']}(...$query['arguments']);
401 401
         });
402 402
 
@@ -430,7 +430,7 @@  discard block
 block discarded – undo
430 430
     {
431 431
         $paginate = $this->findQueryByMethod('paginate');
432 432
 
433
-        $this->queries = $this->queries->reject(function ($query) {
433
+        $this->queries = $this->queries->reject(function($query) {
434 434
             return $query['method'] == 'paginate';
435 435
         });
436 436
 
@@ -488,7 +488,7 @@  discard block
 block discarded – undo
488 488
      */
489 489
     protected function findQueryByMethod($method)
490 490
     {
491
-        return $this->queries->first(function ($query) use ($method) {
491
+        return $this->queries->first(function($query) use ($method) {
492 492
             return $query['method'] == $method;
493 493
         });
494 494
     }
@@ -532,7 +532,7 @@  discard block
 block discarded – undo
532 532
     {
533 533
         list($relationName, $relationColumn) = explode('.', $column);
534 534
 
535
-        if ($this->queries->contains(function ($query) use ($relationName) {
535
+        if ($this->queries->contains(function($query) use ($relationName) {
536 536
             return $query['method'] == 'with' && in_array($relationName, $query['arguments']);
537 537
         })) {
538 538
             $relation = $this->model->$relationName();
@@ -561,7 +561,7 @@  discard block
 block discarded – undo
561 561
      */
562 562
     public function resetOrderBy()
563 563
     {
564
-        $this->queries = $this->queries->reject(function ($query) {
564
+        $this->queries = $this->queries->reject(function($query) {
565 565
             return $query['method'] == 'orderBy' || $query['method'] == 'orderByDesc';
566 566
         });
567 567
     }
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
@@ -212,10 +212,10 @@
 block discarded – undo
212 212
             'middleware' => config('admin.route.middleware'),
213 213
         ];
214 214
 
215
-        app('router')->group($attributes, function ($router) {
215
+        app('router')->group($attributes, function($router) {
216 216
 
217 217
             /* @var \Illuminate\Routing\Router $router */
218
-            $router->group([], function ($router) {
218
+            $router->group([], function($router) {
219 219
 
220 220
                 /* @var \Illuminate\Routing\Router $router */
221 221
                 $router->resource('auth/users', 'UserController');
Please login to merge, or discard this patch.
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/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.