Completed
Pull Request — master (#2802)
by lingfeng
02:31
created
src/Controllers/PermissionController.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -86,8 +86,8 @@  discard block
 block discarded – undo
86 86
         $grid->slug(trans('admin.slug'));
87 87
         $grid->name(trans('admin.name'));
88 88
 
89
-        $grid->http_path(trans('admin.route'))->display(function ($path) {
90
-            return collect(explode("\r\n", $path))->map(function ($path) {
89
+        $grid->http_path(trans('admin.route'))->display(function($path) {
90
+            return collect(explode("\r\n", $path))->map(function($path) {
91 91
                 $method = $this->http_method ?: ['ANY'];
92 92
 
93 93
                 if (Str::contains($path, ':')) {
@@ -95,9 +95,9 @@  discard block
 block discarded – undo
95 95
                     $method = explode(',', $method);
96 96
                 }
97 97
 
98
-                $method = collect($method)->map(function ($name) {
98
+                $method = collect($method)->map(function($name) {
99 99
                     return strtoupper($name);
100
-                })->map(function ($name) {
100
+                })->map(function($name) {
101 101
                     return "<span class='label label-primary'>{$name}</span>";
102 102
                 })->implode('&nbsp;');
103 103
 
@@ -110,8 +110,8 @@  discard block
 block discarded – undo
110 110
         $grid->created_at(trans('admin.created_at'));
111 111
         $grid->updated_at(trans('admin.updated_at'));
112 112
 
113
-        $grid->tools(function (Grid\Tools $tools) {
114
-            $tools->batch(function (Grid\Tools\BatchActions $actions) {
113
+        $grid->tools(function(Grid\Tools $tools) {
114
+            $tools->batch(function(Grid\Tools\BatchActions $actions) {
115 115
                 $actions->disableDelete();
116 116
             });
117 117
         });
@@ -133,8 +133,8 @@  discard block
 block discarded – undo
133 133
         $show->slug(trans('admin.slug'));
134 134
         $show->name(trans('admin.name'));
135 135
 
136
-        $show->http_path(trans('admin.route'))->as(function ($path) {
137
-            return collect(explode("\r\n", $path))->map(function ($path) {
136
+        $show->http_path(trans('admin.route'))->as(function($path) {
137
+            return collect(explode("\r\n", $path))->map(function($path) {
138 138
                 $method = $this->http_method ?: ['ANY'];
139 139
 
140 140
                 if (Str::contains($path, ':')) {
@@ -142,9 +142,9 @@  discard block
 block discarded – undo
142 142
                     $method = explode(',', $method);
143 143
                 }
144 144
 
145
-                $method = collect($method)->map(function ($name) {
145
+                $method = collect($method)->map(function($name) {
146 146
                     return strtoupper($name);
147
-                })->map(function ($name) {
147
+                })->map(function($name) {
148 148
                     return "<span class='label label-primary'>{$name}</span>";
149 149
                 })->implode('&nbsp;');
150 150
 
Please login to merge, or discard this patch.
src/Console/CreateUserCommand.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@
 block discarded – undo
38 38
         /** @var array $selected */
39 39
         $selected = $this->choice('Please choose a role for the user', $roles->pluck('name')->toArray(), null, null, true);
40 40
 
41
-        $roles = $roles->filter(function ($role) use ($selected) {
41
+        $roles = $roles->filter(function($role) use ($selected) {
42 42
             return in_array($role->name, $selected);
43 43
         });
44 44
 
Please login to merge, or discard this patch.
src/Console/ResetPasswordCommand.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@
 block discarded – undo
31 31
         askForUserName:
32 32
         $username = $this->askWithCompletion('Please enter a username who needs to reset his password', $users->pluck('username')->toArray());
33 33
 
34
-        $user = $users->first(function ($user) use ($username) {
34
+        $user = $users->first(function($user) use ($username) {
35 35
             return $user->username == $username;
36 36
         });
37 37
 
Please login to merge, or discard this patch.
src/Grid/Tools.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
      */
86 86
     public function disableFilterButton()
87 87
     {
88
-        $this->tools = $this->tools->reject(function ($tool) {
88
+        $this->tools = $this->tools->reject(function($tool) {
89 89
             return $tool instanceof FilterButton;
90 90
         });
91 91
     }
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
      */
98 98
     public function disableRefreshButton()
99 99
     {
100
-        $this->tools = $this->tools->reject(function ($tool) {
100
+        $this->tools = $this->tools->reject(function($tool) {
101 101
             return $tool instanceof RefreshButton;
102 102
         });
103 103
     }
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
      */
110 110
     public function disableBatchActions()
111 111
     {
112
-        $this->tools = $this->tools->reject(function ($tool) {
112
+        $this->tools = $this->tools->reject(function($tool) {
113 113
             return $tool instanceof BatchActions;
114 114
         });
115 115
     }
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
      */
120 120
     public function batch(\Closure $closure)
121 121
     {
122
-        call_user_func($closure, $this->tools->first(function ($tool) {
122
+        call_user_func($closure, $this->tools->first(function($tool) {
123 123
             return $tool instanceof BatchActions;
124 124
         }));
125 125
     }
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
      */
132 132
     public function render()
133 133
     {
134
-        return $this->tools->map(function ($tool) {
134
+        return $this->tools->map(function($tool) {
135 135
             if ($tool instanceof AbstractTool) {
136 136
                 return $tool->setGrid($this->grid)->render();
137 137
             }
Please login to merge, or discard this patch.
src/Console/AdminCommand.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@
 block discarded – undo
56 56
      */
57 57
     protected function listAdminCommands()
58 58
     {
59
-        $commands = collect(Artisan::all())->mapWithKeys(function ($command, $key) {
59
+        $commands = collect(Artisan::all())->mapWithKeys(function($command, $key) {
60 60
             if (Str::startsWith($key, 'admin:')) {
61 61
                 return [$key => $command];
62 62
             }
Please login to merge, or discard this patch.
src/Form/Tab.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
         $all = $fields->toArray();
71 71
 
72 72
         foreach ($this->form->rows as $row) {
73
-            $rowFields = array_map(function ($field) {
73
+            $rowFields = array_map(function($field) {
74 74
                 return $field['element'];
75 75
             }, $row->getFields());
76 76
 
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
     public function getTabs()
105 105
     {
106 106
         // If there is no active tab, then active the first.
107
-        if ($this->tabs->filter(function ($tab) {
107
+        if ($this->tabs->filter(function($tab) {
108 108
             return $tab['active'];
109 109
         })->isEmpty()) {
110 110
             $first = $this->tabs->first();
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/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.