Completed
Pull Request — master (#2390)
by jxlwqq
04:30
created
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/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();
@@ -452,7 +452,7 @@  discard block
 block discarded – undo
452 452
         $grid = $this->grid;
453 453
         $column = $this;
454 454
 
455
-        $this->display(function ($value) use ($grid, $column, $class) {
455
+        $this->display(function($value) use ($grid, $column, $class) {
456 456
             /** @var AbstractDisplayer $definition */
457 457
             $definition = new $class($value, $grid, $column, $this);
458 458
 
@@ -470,7 +470,7 @@  discard block
 block discarded – undo
470 470
     protected function htmlEntityEncode($item)
471 471
     {
472 472
         if (is_array($item)) {
473
-            array_walk_recursive($item, function (&$value) {
473
+            array_walk_recursive($item, function(&$value) {
474 474
                 $value = htmlentities($value);
475 475
             });
476 476
         } else {
@@ -550,7 +550,7 @@  discard block
 block discarded – undo
550 550
      */
551 551
     protected function callSupportDisplayer($abstract, $arguments)
552 552
     {
553
-        return $this->display(function ($value) use ($abstract, $arguments) {
553
+        return $this->display(function($value) use ($abstract, $arguments) {
554 554
             if (is_array($value) || $value instanceof Arrayable) {
555 555
                 return call_user_func_array([collect($value), $abstract], $arguments);
556 556
             }
@@ -574,7 +574,7 @@  discard block
 block discarded – undo
574 574
     protected function callBuiltinDisplayer($abstract, $arguments)
575 575
     {
576 576
         if ($abstract instanceof Closure) {
577
-            return $this->display(function ($value) use ($abstract, $arguments) {
577
+            return $this->display(function($value) use ($abstract, $arguments) {
578 578
                 return $abstract->call($this, ...array_merge([$value], $arguments));
579 579
             });
580 580
         }
@@ -583,7 +583,7 @@  discard block
 block discarded – undo
583 583
             $grid = $this->grid;
584 584
             $column = $this;
585 585
 
586
-            return $this->display(function ($value) use ($abstract, $grid, $column, $arguments) {
586
+            return $this->display(function($value) use ($abstract, $grid, $column, $arguments) {
587 587
                 $displayer = new $abstract($value, $grid, $column, $this);
588 588
 
589 589
                 return $displayer->display(...$arguments);
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.php 1 patch
Spacing   +9 added lines, -9 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
     }
@@ -375,7 +375,7 @@  discard block
 block discarded – undo
375 375
      */
376 376
     public function column($width, \Closure $closure)
377 377
     {
378
-        $width = $width < 1 ? round(12*$width) : $width;
378
+        $width = $width < 1 ? round(12 * $width) : $width;
379 379
 
380 380
         $this->layout->column($width, $closure);
381 381
 
@@ -466,9 +466,9 @@  discard block
 block discarded – undo
466 466
 
467 467
         $columns->push($pageKey);
468 468
 
469
-        $groupNames = collect($this->filters)->filter(function ($filter) {
469
+        $groupNames = collect($this->filters)->filter(function($filter) {
470 470
             return $filter instanceof Group;
471
-        })->map(function (AbstractFilter $filter) {
471
+        })->map(function(AbstractFilter $filter) {
472 472
             return "{$filter->getId()}_group";
473 473
         });
474 474
 
Please login to merge, or discard this patch.
src/Layout/Row.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
      */
30 30
     public function column($width, $content)
31 31
     {
32
-        $width = $width < 1 ? round(12*$width) : $width;
32
+        $width = $width < 1 ? round(12 * $width) : $width;
33 33
 
34 34
         $column = new Column($content, $width);
35 35
 
Please login to merge, or discard this patch.
src/Form.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -272,7 +272,7 @@  discard block
 block discarded – undo
272 272
     {
273 273
         $ids = explode(',', $id);
274 274
 
275
-        collect($ids)->filter()->each(function ($id) {
275
+        collect($ids)->filter()->each(function($id) {
276 276
             $this->deleteFiles($id);
277 277
             $this->model()->find($id)->delete();
278 278
         });
@@ -297,9 +297,9 @@  discard block
 block discarded – undo
297 297
             ->with($this->getRelations())
298 298
             ->findOrFail($id)->toArray();
299 299
 
300
-        $this->builder->fields()->filter(function ($field) {
300
+        $this->builder->fields()->filter(function($field) {
301 301
             return $field instanceof Field\File;
302
-        })->each(function (Field\File $file) use ($data) {
302
+        })->each(function(Field\File $file) use ($data) {
303 303
             $file->setOriginal($data);
304 304
 
305 305
             $file->destroy();
@@ -324,7 +324,7 @@  discard block
 block discarded – undo
324 324
             return $response;
325 325
         }
326 326
 
327
-        DB::transaction(function () {
327
+        DB::transaction(function() {
328 328
             $inserts = $this->prepareInsert($this->updates);
329 329
 
330 330
             foreach ($inserts as $column => $value) {
@@ -515,7 +515,7 @@  discard block
 block discarded – undo
515 515
             return $response;
516 516
         }
517 517
 
518
-        DB::transaction(function () {
518
+        DB::transaction(function() {
519 519
             $updates = $this->prepareUpdate($this->updates);
520 520
 
521 521
             foreach ($updates as $column => $value) {
@@ -950,7 +950,7 @@  discard block
 block discarded – undo
950 950
     protected function getFieldByColumn($column)
951 951
     {
952 952
         return $this->builder->fields()->first(
953
-            function (Field $field) use ($column) {
953
+            function(Field $field) use ($column) {
954 954
                 if (is_array($field->column())) {
955 955
                     return in_array($column, $field->column());
956 956
                 }
@@ -971,7 +971,7 @@  discard block
 block discarded – undo
971 971
 
972 972
         $values = $this->model->toArray();
973 973
 
974
-        $this->builder->fields()->each(function (Field $field) use ($values) {
974
+        $this->builder->fields()->each(function(Field $field) use ($values) {
975 975
             $field->setOriginal($values);
976 976
         });
977 977
     }
@@ -993,7 +993,7 @@  discard block
 block discarded – undo
993 993
 
994 994
         $data = $this->model->toArray();
995 995
 
996
-        $this->builder->fields()->each(function (Field $field) use ($data) {
996
+        $this->builder->fields()->each(function(Field $field) use ($data) {
997 997
             if (!in_array($field->column(), $this->ignored)) {
998 998
                 $field->fill($data);
999 999
             }
@@ -1116,7 +1116,7 @@  discard block
 block discarded – undo
1116 1116
      */
1117 1117
     public function setWidth($fieldWidth = 8, $labelWidth = 2)
1118 1118
     {
1119
-        $this->builder()->fields()->each(function ($field) use ($fieldWidth, $labelWidth) {
1119
+        $this->builder()->fields()->each(function($field) use ($fieldWidth, $labelWidth) {
1120 1120
             /* @var Field $field  */
1121 1121
             $field->setWidth($fieldWidth, $labelWidth);
1122 1122
         });
Please login to merge, or discard this patch.