Completed
Pull Request — master (#3101)
by Robin
02:50
created
src/Controllers/RoleController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -90,14 +90,14 @@  discard block
 block discarded – undo
90 90
         $grid->created_at(trans('admin.created_at'));
91 91
         $grid->updated_at(trans('admin.updated_at'));
92 92
 
93
-        $grid->actions(function (Grid\Displayers\Actions $actions) {
93
+        $grid->actions(function(Grid\Displayers\Actions $actions) {
94 94
             if ($actions->row->slug == 'administrator') {
95 95
                 $actions->disableDelete();
96 96
             }
97 97
         });
98 98
 
99
-        $grid->tools(function (Grid\Tools $tools) {
100
-            $tools->batch(function (Grid\Tools\BatchActions $actions) {
99
+        $grid->tools(function(Grid\Tools $tools) {
100
+            $tools->batch(function(Grid\Tools\BatchActions $actions) {
101 101
                 $actions->disableDelete();
102 102
             });
103 103
         });
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
         $show->id('ID');
119 119
         $show->slug(trans('admin.slug'));
120 120
         $show->name(trans('admin.name'));
121
-        $show->permissions(trans('admin.permissions'))->as(function ($permission) {
121
+        $show->permissions(trans('admin.permissions'))->as(function($permission) {
122 122
             return $permission->pluck('name');
123 123
         })->label();
124 124
         $show->created_at(trans('admin.created_at'));
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/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   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -324,7 +324,7 @@  discard block
 block discarded – undo
324 324
      */
325 325
     public function destroy($id)
326 326
     {
327
-        collect(explode(',', $id))->filter()->each(function ($id) {
327
+        collect(explode(',', $id))->filter()->each(function($id) {
328 328
             $builder = $this->model()->newQuery();
329 329
 
330 330
             if ($this->isSoftDeletes) {
@@ -362,9 +362,9 @@  discard block
 block discarded – undo
362 362
 
363 363
         $data = $model->toArray();
364 364
 
365
-        $this->builder->fields()->filter(function ($field) {
365
+        $this->builder->fields()->filter(function($field) {
366 366
             return $field instanceof Field\File;
367
-        })->each(function (Field\File $file) use ($data) {
367
+        })->each(function(Field\File $file) use ($data) {
368 368
             $file->setOriginal($data);
369 369
 
370 370
             $file->destroy();
@@ -389,7 +389,7 @@  discard block
 block discarded – undo
389 389
             return $response;
390 390
         }
391 391
 
392
-        DB::transaction(function () {
392
+        DB::transaction(function() {
393 393
             $inserts = $this->prepareInsert($this->updates);
394 394
 
395 395
             foreach ($inserts as $column => $value) {
@@ -598,7 +598,7 @@  discard block
 block discarded – undo
598 598
             return $response;
599 599
         }
600 600
 
601
-        DB::transaction(function () {
601
+        DB::transaction(function() {
602 602
             $updates = $this->prepareUpdate($this->updates);
603 603
 
604 604
             foreach ($updates as $column => $value) {
@@ -662,13 +662,13 @@  discard block
 block discarded – undo
662 662
     {
663 663
         if (request('after-save') == 1) {
664 664
             // continue editing
665
-            $url = rtrim($resourcesPath, '/') . "/{$key}/edit";
665
+            $url = rtrim($resourcesPath, '/')."/{$key}/edit";
666 666
         } elseif (request('after-save') == 2) {
667 667
             // continue creating
668
-            $url = rtrim($resourcesPath, '/') . '/create';
668
+            $url = rtrim($resourcesPath, '/').'/create';
669 669
         } elseif (request('after-save') == 3) {
670 670
             // view resource
671
-            $url = rtrim($resourcesPath, '/') . "/{$key}";
671
+            $url = rtrim($resourcesPath, '/')."/{$key}";
672 672
         } else {
673 673
             $url = request(Builder::PREVIOUS_URL_KEY) ?: $resourcesPath;
674 674
         }
@@ -913,7 +913,7 @@  discard block
 block discarded – undo
913 913
      */
914 914
     protected function invalidColumn($columns, $oneToOneRelation = false)
915 915
     {
916
-        foreach ((array)$columns as $column) {
916
+        foreach ((array) $columns as $column) {
917 917
             if (
918 918
                 (!$oneToOneRelation && Str::contains($column, '.')) || ($oneToOneRelation && !Str::contains($column, '.'))
919 919
             ) {
@@ -1035,7 +1035,7 @@  discard block
 block discarded – undo
1035 1035
      */
1036 1036
     public function ignore($fields)
1037 1037
     {
1038
-        $this->ignored = array_merge($this->ignored, (array)$fields);
1038
+        $this->ignored = array_merge($this->ignored, (array) $fields);
1039 1039
 
1040 1040
         return $this;
1041 1041
     }
@@ -1075,7 +1075,7 @@  discard block
 block discarded – undo
1075 1075
     protected function getFieldByColumn($column)
1076 1076
     {
1077 1077
         return $this->builder->fields()->first(
1078
-            function (Field $field) use ($column) {
1078
+            function(Field $field) use ($column) {
1079 1079
                 if (is_array($field->column())) {
1080 1080
                     return in_array($column, $field->column());
1081 1081
                 }
@@ -1096,7 +1096,7 @@  discard block
 block discarded – undo
1096 1096
 
1097 1097
         $values = $this->model->toArray();
1098 1098
 
1099
-        $this->builder->fields()->each(function (Field $field) use ($values) {
1099
+        $this->builder->fields()->each(function(Field $field) use ($values) {
1100 1100
             $field->setOriginal($values);
1101 1101
         });
1102 1102
     }
@@ -1126,7 +1126,7 @@  discard block
 block discarded – undo
1126 1126
 
1127 1127
         $data = $this->model->toArray();
1128 1128
 
1129
-        $this->builder->fields()->each(function (Field $field) use ($data) {
1129
+        $this->builder->fields()->each(function(Field $field) use ($data) {
1130 1130
             if (!in_array($field->column(), $this->ignored)) {
1131 1131
                 $field->fill($data);
1132 1132
             }
@@ -1251,7 +1251,7 @@  discard block
 block discarded – undo
1251 1251
      */
1252 1252
     public function setWidth($fieldWidth = 8, $labelWidth = 2)
1253 1253
     {
1254
-        $this->builder()->fields()->each(function ($field) use ($fieldWidth, $labelWidth) {
1254
+        $this->builder()->fields()->each(function($field) use ($fieldWidth, $labelWidth) {
1255 1255
             /* @var Field $field  */
1256 1256
             $field->setWidth($fieldWidth, $labelWidth);
1257 1257
         });
Please login to merge, or discard this patch.
src/Grid/Filter/Layout/Column.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -73,7 +73,7 @@
 block discarded – undo
73 73
      */
74 74
     public function removeFilterByID($id)
75 75
     {
76
-        $this->filters = $this->filters->reject(function (AbstractFilter $filter) use ($id) {
76
+        $this->filters = $this->filters->reject(function(AbstractFilter $filter) use ($id) {
77 77
             return $filter->getId() == $id;
78 78
         });
79 79
     }
Please login to merge, or discard this patch.
src/Middleware/LogOperation.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -66,7 +66,7 @@
 block discarded – undo
66 66
             return true;
67 67
         }
68 68
 
69
-        return $allowedMethods->map(function ($method) {
69
+        return $allowedMethods->map(function($method) {
70 70
             return strtoupper($method);
71 71
         })->contains($method);
72 72
     }
Please login to merge, or discard this patch.
src/Grid/Displayers/SwitchDisplay.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@
 block discarded – undo
30 30
         if ($keys->isEmpty()) {
31 31
             $key = $name;
32 32
         } else {
33
-            $key = $keys->shift().$keys->reduce(function ($carry, $val) {
33
+            $key = $keys->shift().$keys->reduce(function($carry, $val) {
34 34
                 return $carry."[$val]";
35 35
             });
36 36
         }
Please login to merge, or discard this patch.