Completed
Pull Request — master (#3885)
by zi
02:20
created
src/Grid/Column.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -486,7 +486,7 @@  discard block
 block discarded – undo
486 486
         $name = $this->getName();
487 487
         $query = request()->query();
488 488
 
489
-        $this->prefix(function ($_, $original) use ($name, $query) {
489
+        $this->prefix(function($_, $original) use ($name, $query) {
490 490
             Arr::set($query, $name, $original);
491 491
 
492 492
             $url = request()->fullUrlWithQuery($query);
@@ -539,7 +539,7 @@  discard block
 block discarded – undo
539 539
 
540 540
         $column = $this;
541 541
 
542
-        return $this->display(function ($value) use ($grid, $column, $abstract, $arguments) {
542
+        return $this->display(function($value) use ($grid, $column, $abstract, $arguments) {
543 543
             /** @var AbstractDisplayer $displayer */
544 544
             $displayer = new $abstract($value, $grid, $column, $this);
545 545
 
@@ -557,7 +557,7 @@  discard block
 block discarded – undo
557 557
      */
558 558
     public function using(array $values, $default = null)
559 559
     {
560
-        return $this->display(function ($value) use ($values, $default) {
560
+        return $this->display(function($value) use ($values, $default) {
561 561
             if (is_null($value)) {
562 562
                 return $default;
563 563
             }
@@ -575,7 +575,7 @@  discard block
 block discarded – undo
575 575
      */
576 576
     public function replace(array $replacements)
577 577
     {
578
-        return $this->display(function ($value) use ($replacements) {
578
+        return $this->display(function($value) use ($replacements) {
579 579
             if (isset($replacements[$value])) {
580 580
                 return $replacements[$value];
581 581
             }
@@ -593,7 +593,7 @@  discard block
 block discarded – undo
593 593
      */
594 594
     public function view($view)
595 595
     {
596
-        return $this->display(function ($value) use ($view) {
596
+        return $this->display(function($value) use ($view) {
597 597
             $model = $this;
598 598
 
599 599
             return view($view, compact('model', 'value'))->render();
@@ -633,7 +633,7 @@  discard block
 block discarded – undo
633 633
      */
634 634
     public function filesize()
635 635
     {
636
-        return $this->display(function ($value) {
636
+        return $this->display(function($value) {
637 637
             return file_size($value);
638 638
         });
639 639
     }
@@ -647,7 +647,7 @@  discard block
 block discarded – undo
647 647
      */
648 648
     public function gravatar($size = 30)
649 649
     {
650
-        return $this->display(function ($value) use ($size) {
650
+        return $this->display(function($value) use ($size) {
651 651
             $src = sprintf(
652 652
                 'https://www.gravatar.com/avatar/%s?s=%d',
653 653
                 md5(strtolower($value)),
@@ -668,7 +668,7 @@  discard block
 block discarded – undo
668 668
      */
669 669
     public function loading($values = [], $others = [])
670 670
     {
671
-        return $this->display(function ($value) use ($values, $others) {
671
+        return $this->display(function($value) use ($values, $others) {
672 672
             $values = (array) $values;
673 673
 
674 674
             if (in_array($value, $values)) {
@@ -689,7 +689,7 @@  discard block
 block discarded – undo
689 689
      */
690 690
     public function icon(array $setting, $default = '')
691 691
     {
692
-        return $this->display(function ($value) use ($setting, $default) {
692
+        return $this->display(function($value) use ($setting, $default) {
693 693
             $fa = '';
694 694
 
695 695
             if (isset($setting[$value])) {
@@ -715,7 +715,7 @@  discard block
 block discarded – undo
715 715
             Carbon::setLocale($locale);
716 716
         }
717 717
 
718
-        return $this->display(function ($value) {
718
+        return $this->display(function($value) {
719 719
             return Carbon::parse($value)->diffForHumans();
720 720
         });
721 721
     }
@@ -729,7 +729,7 @@  discard block
 block discarded – undo
729 729
      */
730 730
     public function date($format)
731 731
     {
732
-        return $this->display(function ($value) use ($format) {
732
+        return $this->display(function($value) use ($format) {
733 733
             return date($format, strtotime($value));
734 734
         });
735 735
     }
@@ -744,7 +744,7 @@  discard block
 block discarded – undo
744 744
      */
745 745
     public function bool(array $map = [], $default = false)
746 746
     {
747
-        return $this->display(function ($value) use ($map, $default) {
747
+        return $this->display(function($value) use ($map, $default) {
748 748
             $bool = empty($map) ? boolval($value) : Arr::get($map, $value, $default);
749 749
 
750 750
             return $bool ? '<i class="fa fa-check text-green"></i>' : '<i class="fa fa-close text-red"></i>';
@@ -766,7 +766,7 @@  discard block
 block discarded – undo
766 766
 
767 767
         $grid = $this->grid;
768 768
 
769
-        return $this->display(function ($_, $column) use ($action, $grid) {
769
+        return $this->display(function($_, $column) use ($action, $grid) {
770 770
             /** @var RowAction $action */
771 771
             $action = new $action();
772 772
 
@@ -788,7 +788,7 @@  discard block
 block discarded – undo
788 788
      */
789 789
     public function dot($options = [], $default = '')
790 790
     {
791
-        return $this->prefix(function ($_, $original) use ($options, $default) {
791
+        return $this->prefix(function($_, $original) use ($options, $default) {
792 792
             if (is_null($original)) {
793 793
                 $style = $default;
794 794
             } else {
@@ -915,7 +915,7 @@  discard block
 block discarded – undo
915 915
         $grid = $this->grid;
916 916
         $column = $this;
917 917
 
918
-        $this->display(function ($value) use ($grid, $column, $class) {
918
+        $this->display(function($value) use ($grid, $column, $class) {
919 919
             /** @var AbstractDisplayer $definition */
920 920
             $definition = new $class($value, $grid, $column, $this);
921 921
 
@@ -933,7 +933,7 @@  discard block
 block discarded – undo
933 933
     protected function htmlEntityEncode($item)
934 934
     {
935 935
         if (is_array($item)) {
936
-            array_walk_recursive($item, function (&$value) {
936
+            array_walk_recursive($item, function(&$value) {
937 937
                 $value = htmlentities($value);
938 938
             });
939 939
         } else {
@@ -970,7 +970,7 @@  discard block
 block discarded – undo
970 970
      */
971 971
     protected function callSupportDisplayer($abstract, $arguments)
972 972
     {
973
-        return $this->display(function ($value) use ($abstract, $arguments) {
973
+        return $this->display(function($value) use ($abstract, $arguments) {
974 974
             if (is_array($value) || $value instanceof Arrayable) {
975 975
                 return call_user_func_array([collect($value), $abstract], $arguments);
976 976
             }
@@ -994,7 +994,7 @@  discard block
 block discarded – undo
994 994
     protected function callBuiltinDisplayer($abstract, $arguments)
995 995
     {
996 996
         if ($abstract instanceof Closure) {
997
-            return $this->display(function ($value) use ($abstract, $arguments) {
997
+            return $this->display(function($value) use ($abstract, $arguments) {
998 998
                 return $abstract->call($this, ...array_merge([$value], $arguments));
999 999
             });
1000 1000
         }
@@ -1003,7 +1003,7 @@  discard block
 block discarded – undo
1003 1003
             $grid = $this->grid;
1004 1004
             $column = $this;
1005 1005
 
1006
-            return $this->display(function ($value) use ($abstract, $grid, $column, $arguments) {
1006
+            return $this->display(function($value) use ($abstract, $grid, $column, $arguments) {
1007 1007
                 /** @var AbstractDisplayer $displayer */
1008 1008
                 $displayer = new $abstract($value, $grid, $column, $this);
1009 1009
 
Please login to merge, or discard this patch.
src/Grid/Row.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -120,7 +120,7 @@
 block discarded – undo
120 120
     public function style($style)
121 121
     {
122 122
         if (is_array($style)) {
123
-            $style = implode(';', array_map(function ($key, $val) {
123
+            $style = implode(';', array_map(function($key, $val) {
124 124
                 return "$key:$val";
125 125
             }, array_keys($style), array_values($style)));
126 126
         }
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
@@ -285,7 +285,7 @@  discard block
 block discarded – undo
285 285
      */
286 286
     public function removeFilterByID($id)
287 287
     {
288
-        $this->filters = array_filter($this->filters, function (AbstractFilter $filter) use ($id) {
288
+        $this->filters = array_filter($this->filters, function(AbstractFilter $filter) use ($id) {
289 289
             return $filter->getId() != $id;
290 290
         });
291 291
     }
@@ -299,7 +299,7 @@  discard block
 block discarded – undo
299 299
     {
300 300
         $inputs = Arr::dot(request()->all());
301 301
 
302
-        $inputs = array_filter($inputs, function ($input) {
302
+        $inputs = array_filter($inputs, function($input) {
303 303
             return $input !== '' && !is_null($input);
304 304
         });
305 305
 
@@ -327,7 +327,7 @@  discard block
 block discarded – undo
327 327
             }
328 328
         }
329 329
 
330
-        return tap(array_filter($conditions), function ($conditions) {
330
+        return tap(array_filter($conditions), function($conditions) {
331 331
             if (!empty($conditions)) {
332 332
                 $this->expand();
333 333
             }
@@ -345,9 +345,9 @@  discard block
 block discarded – undo
345 345
             return $inputs;
346 346
         }
347 347
 
348
-        $inputs = collect($inputs)->filter(function ($input, $key) {
348
+        $inputs = collect($inputs)->filter(function($input, $key) {
349 349
             return Str::startsWith($key, "{$this->name}_");
350
-        })->mapWithKeys(function ($val, $key) {
350
+        })->mapWithKeys(function($val, $key) {
351 351
             $key = str_replace("{$this->name}_", '', $key);
352 352
 
353 353
             return [$key => $val];
@@ -417,7 +417,7 @@  discard block
 block discarded – undo
417 417
      */
418 418
     public function scope($key, $label = '')
419 419
     {
420
-        return tap(new Scope($key, $label), function (Scope $scope) {
420
+        return tap(new Scope($key, $label), function(Scope $scope) {
421 421
             return $this->scopes->push($scope);
422 422
         });
423 423
     }
@@ -441,7 +441,7 @@  discard block
 block discarded – undo
441 441
     {
442 442
         $key = request(Scope::QUERY_NAME);
443 443
 
444
-        return $this->scopes->first(function ($scope) use ($key) {
444
+        return $this->scopes->first(function($scope) use ($key) {
445 445
             return $scope->key == $key;
446 446
         });
447 447
     }
@@ -566,9 +566,9 @@  discard block
 block discarded – undo
566 566
 
567 567
         $columns->push($pageKey);
568 568
 
569
-        $groupNames = collect($this->filters)->filter(function ($filter) {
569
+        $groupNames = collect($this->filters)->filter(function($filter) {
570 570
             return $filter instanceof Filter\Group;
571
-        })->map(function (AbstractFilter $filter) {
571
+        })->map(function(AbstractFilter $filter) {
572 572
             return "{$filter->getId()}_group";
573 573
         });
574 574
 
Please login to merge, or discard this patch.
database/migrations/2016_01_04_173148_create_admin_tables.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
      */
22 22
     public function up()
23 23
     {
24
-        Schema::create(config('admin.database.users_table'), function (Blueprint $table) {
24
+        Schema::create(config('admin.database.users_table'), function(Blueprint $table) {
25 25
             $table->bigIncrements('id');
26 26
             $table->string('username', 190)->unique();
27 27
             $table->string('password', 60);
@@ -31,14 +31,14 @@  discard block
 block discarded – undo
31 31
             $table->timestamps();
32 32
         });
33 33
 
34
-        Schema::create(config('admin.database.roles_table'), function (Blueprint $table) {
34
+        Schema::create(config('admin.database.roles_table'), function(Blueprint $table) {
35 35
             $table->bigIncrements('id');
36 36
             $table->string('name', 50)->unique();
37 37
             $table->string('slug', 50)->unique();
38 38
             $table->timestamps();
39 39
         });
40 40
 
41
-        Schema::create(config('admin.database.permissions_table'), function (Blueprint $table) {
41
+        Schema::create(config('admin.database.permissions_table'), function(Blueprint $table) {
42 42
             $table->bigIncrements('id');
43 43
             $table->string('name', 50)->unique();
44 44
             $table->string('slug', 50)->unique();
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
             $table->timestamps();
48 48
         });
49 49
 
50
-        Schema::create(config('admin.database.menu_table'), function (Blueprint $table) {
50
+        Schema::create(config('admin.database.menu_table'), function(Blueprint $table) {
51 51
             $table->bigIncrements('id');
52 52
             $table->bigInteger('parent_id')->default(0);
53 53
             $table->bigInteger('order')->default(0);
@@ -59,35 +59,35 @@  discard block
 block discarded – undo
59 59
             $table->timestamps();
60 60
         });
61 61
 
62
-        Schema::create(config('admin.database.role_users_table'), function (Blueprint $table) {
62
+        Schema::create(config('admin.database.role_users_table'), function(Blueprint $table) {
63 63
             $table->bigInteger('role_id');
64 64
             $table->bigInteger('user_id');
65 65
             $table->index(['role_id', 'user_id']);
66 66
             $table->timestamps();
67 67
         });
68 68
 
69
-        Schema::create(config('admin.database.role_permissions_table'), function (Blueprint $table) {
69
+        Schema::create(config('admin.database.role_permissions_table'), function(Blueprint $table) {
70 70
             $table->bigInteger('role_id');
71 71
             $table->bigInteger('permission_id');
72 72
             $table->index(['role_id', 'permission_id']);
73 73
             $table->timestamps();
74 74
         });
75 75
 
76
-        Schema::create(config('admin.database.user_permissions_table'), function (Blueprint $table) {
76
+        Schema::create(config('admin.database.user_permissions_table'), function(Blueprint $table) {
77 77
             $table->bigInteger('user_id');
78 78
             $table->bigInteger('permission_id');
79 79
             $table->index(['user_id', 'permission_id']);
80 80
             $table->timestamps();
81 81
         });
82 82
 
83
-        Schema::create(config('admin.database.role_menu_table'), function (Blueprint $table) {
83
+        Schema::create(config('admin.database.role_menu_table'), function(Blueprint $table) {
84 84
             $table->bigInteger('role_id');
85 85
             $table->bigInteger('menu_id');
86 86
             $table->index(['role_id', 'menu_id']);
87 87
             $table->timestamps();
88 88
         });
89 89
 
90
-        Schema::create(config('admin.database.operation_log_table'), function (Blueprint $table) {
90
+        Schema::create(config('admin.database.operation_log_table'), function(Blueprint $table) {
91 91
             $table->bigIncrements('id');
92 92
             $table->bigInteger('user_id');
93 93
             $table->string('path');
Please login to merge, or discard this patch.