Completed
Pull Request — master (#2400)
by jxlwqq
03:37
created
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/Form.php 2 patches
Doc Comments   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -265,7 +265,7 @@  discard block
 block discarded – undo
265 265
      *
266 266
      * @param $id
267 267
      *
268
-     * @return mixed
268
+     * @return boolean
269 269
      */
270 270
     public function destroy($id)
271 271
     {
@@ -369,7 +369,7 @@  discard block
 block discarded – undo
369 369
      *
370 370
      * @param array $data
371 371
      *
372
-     * @return mixed
372
+     * @return Response|null
373 373
      */
374 374
     protected function prepare($data = [])
375 375
     {
@@ -429,7 +429,7 @@  discard block
 block discarded – undo
429 429
     /**
430 430
      * Call submitted callback.
431 431
      *
432
-     * @return mixed
432
+     * @return Response|null
433 433
      */
434 434
     protected function callSubmitted()
435 435
     {
@@ -443,7 +443,7 @@  discard block
 block discarded – undo
443 443
     /**
444 444
      * Call saving callback.
445 445
      *
446
-     * @return mixed
446
+     * @return Response|null
447 447
      */
448 448
     protected function callSaving()
449 449
     {
@@ -457,7 +457,7 @@  discard block
 block discarded – undo
457 457
     /**
458 458
      * Callback after saving a Model.
459 459
      *
460
-     * @return mixed|null
460
+     * @return Response|null
461 461
      */
462 462
     protected function callSaved()
463 463
     {
@@ -551,7 +551,7 @@  discard block
 block discarded – undo
551 551
     /**
552 552
      * Get RedirectResponse after update.
553 553
      *
554
-     * @param mixed $key
554
+     * @param integer $key
555 555
      *
556 556
      * @return \Illuminate\Http\RedirectResponse
557 557
      */
Please login to merge, or discard this 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.
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/Field.php 1 patch
Doc Comments   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
     /**
209 209
      * Field constructor.
210 210
      *
211
-     * @param       $column
211
+     * @param       string $column
212 212
      * @param array $arguments
213 213
      */
214 214
     public function __construct($column, $arguments = [])
@@ -342,7 +342,7 @@  discard block
 block discarded – undo
342 342
     /**
343 343
      * custom format form column data when edit.
344 344
      *
345
-     * @param Closure $call
345
+     * @param \Closure $call
346 346
      *
347 347
      * @return [null]
348 348
      */
@@ -422,7 +422,7 @@  discard block
 block discarded – undo
422 422
     /**
423 423
      * Get or set rules.
424 424
      *
425
-     * @param null  $rules
425
+     * @param string  $rules
426 426
      * @param array $messages
427 427
      *
428 428
      * @return $this
@@ -520,7 +520,7 @@  discard block
 block discarded – undo
520 520
     /**
521 521
      * Set or get value of the field.
522 522
      *
523
-     * @param null $value
523
+     * @param string $value
524 524
      *
525 525
      * @return mixed
526 526
      */
@@ -673,7 +673,7 @@  discard block
 block discarded – undo
673 673
     /**
674 674
      * Add html attributes to elements.
675 675
      *
676
-     * @param array|string $attribute
676
+     * @param string $attribute
677 677
      * @param mixed        $value
678 678
      *
679 679
      * @return $this
Please login to merge, or discard this patch.