Completed
Pull Request — master (#2473)
by jxlwqq
02:37
created
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/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/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/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) {
@@ -736,7 +736,7 @@  discard block
 block discarded – undo
736 736
                     $parent->save();
737 737
 
738 738
                     // When in creating, associate two models
739
-                    if (! $this->model->{$relation->getForeignKey()}) {
739
+                    if (!$this->model->{$relation->getForeignKey()}) {
740 740
                         $this->model->{$relation->getForeignKey()} = $parent->getKey();
741 741
 
742 742
                         $this->model->save();
@@ -979,7 +979,7 @@  discard block
 block discarded – undo
979 979
     protected function getFieldByColumn($column)
980 980
     {
981 981
         return $this->builder->fields()->first(
982
-            function (Field $field) use ($column) {
982
+            function(Field $field) use ($column) {
983 983
                 if (is_array($field->column())) {
984 984
                     return in_array($column, $field->column());
985 985
                 }
@@ -1000,7 +1000,7 @@  discard block
 block discarded – undo
1000 1000
 
1001 1001
         $values = $this->model->toArray();
1002 1002
 
1003
-        $this->builder->fields()->each(function (Field $field) use ($values) {
1003
+        $this->builder->fields()->each(function(Field $field) use ($values) {
1004 1004
             $field->setOriginal($values);
1005 1005
         });
1006 1006
     }
@@ -1022,7 +1022,7 @@  discard block
 block discarded – undo
1022 1022
 
1023 1023
         $data = $this->model->toArray();
1024 1024
 
1025
-        $this->builder->fields()->each(function (Field $field) use ($data) {
1025
+        $this->builder->fields()->each(function(Field $field) use ($data) {
1026 1026
             if (!in_array($field->column(), $this->ignored)) {
1027 1027
                 $field->fill($data);
1028 1028
             }
@@ -1145,7 +1145,7 @@  discard block
 block discarded – undo
1145 1145
      */
1146 1146
     public function setWidth($fieldWidth = 8, $labelWidth = 2)
1147 1147
     {
1148
-        $this->builder()->fields()->each(function ($field) use ($fieldWidth, $labelWidth) {
1148
+        $this->builder()->fields()->each(function($field) use ($fieldWidth, $labelWidth) {
1149 1149
             /* @var Field $field  */
1150 1150
             $field->setWidth($fieldWidth, $labelWidth);
1151 1151
         });
Please login to merge, or discard this patch.