Completed
Pull Request — master (#2254)
by
unknown
02:53
created
src/Auth/Database/Role.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -86,7 +86,7 @@
 block discarded – undo
86 86
     {
87 87
         parent::boot();
88 88
 
89
-        static::deleting(function ($model) {
89
+        static::deleting(function($model) {
90 90
             $model->administrators()->detach();
91 91
 
92 92
             $model->permissions()->detach();
Please login to merge, or discard this patch.
src/Auth/Database/Permission.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
 
67 67
         $method = $this->http_method;
68 68
 
69
-        $matches = array_map(function ($path) use ($method) {
69
+        $matches = array_map(function($path) use ($method) {
70 70
             $path = trim(config('admin.route.prefix'), '/').$path;
71 71
 
72 72
             if (Str::contains($path, ':')) {
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
             return false;
101 101
         }
102 102
 
103
-        $method = collect($match['method'])->filter()->map(function ($method) {
103
+        $method = collect($match['method'])->filter()->map(function($method) {
104 104
             return strtoupper($method);
105 105
         });
106 106
 
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
     {
141 141
         parent::boot();
142 142
 
143
-        static::deleting(function ($model) {
143
+        static::deleting(function($model) {
144 144
             $model->roles()->detach();
145 145
         });
146 146
     }
Please login to merge, or discard this patch.
src/Auth/Database/Menu.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@
 block discarded – undo
78 78
     {
79 79
         static::treeBoot();
80 80
 
81
-        static::deleting(function ($model) {
81
+        static::deleting(function($model) {
82 82
             $model->roles()->detach();
83 83
         });
84 84
     }
Please login to merge, or discard this patch.
src/Grid/Model.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -225,9 +225,9 @@  discard block
 block discarded – undo
225 225
 
226 226
         $this->setSort();
227 227
 
228
-        $this->queries->reject(function ($query) {
228
+        $this->queries->reject(function($query) {
229 229
             return $query['method'] == 'paginate';
230
-        })->each(function ($query) {
230
+        })->each(function($query) {
231 231
             $this->model = $this->model->{$query['method']}(...$query['arguments']);
232 232
         });
233 233
 
@@ -274,7 +274,7 @@  discard block
 block discarded – undo
274 274
         $this->setSort();
275 275
         $this->setPaginate();
276 276
 
277
-        $this->queries->unique()->each(function ($query) {
277
+        $this->queries->unique()->each(function($query) {
278 278
             $this->model = call_user_func_array([$this->model, $query['method']], $query['arguments']);
279 279
         });
280 280
 
@@ -318,7 +318,7 @@  discard block
 block discarded – undo
318 318
     {
319 319
         $paginate = $this->findQueryByMethod('paginate');
320 320
 
321
-        $this->queries = $this->queries->reject(function ($query) {
321
+        $this->queries = $this->queries->reject(function($query) {
322 322
             return $query['method'] == 'paginate';
323 323
         });
324 324
 
@@ -372,7 +372,7 @@  discard block
 block discarded – undo
372 372
      */
373 373
     protected function findQueryByMethod($method)
374 374
     {
375
-        return $this->queries->first(function ($query) use ($method) {
375
+        return $this->queries->first(function($query) use ($method) {
376 376
             return $query['method'] == $method;
377 377
         });
378 378
     }
@@ -416,7 +416,7 @@  discard block
 block discarded – undo
416 416
     {
417 417
         list($relationName, $relationColumn) = explode('.', $column);
418 418
 
419
-        if ($this->queries->contains(function ($query) use ($relationName) {
419
+        if ($this->queries->contains(function($query) use ($relationName) {
420 420
             return $query['method'] == 'with' && in_array($relationName, $query['arguments']);
421 421
         })) {
422 422
             $relation = $this->model->$relationName();
@@ -445,7 +445,7 @@  discard block
 block discarded – undo
445 445
      */
446 446
     public function resetOrderBy()
447 447
     {
448
-        $this->queries = $this->queries->reject(function ($query) {
448
+        $this->queries = $this->queries->reject(function($query) {
449 449
             return $query['method'] == 'orderBy' || $query['method'] == 'orderByDesc';
450 450
         });
451 451
     }
Please login to merge, or discard this patch.
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -411,7 +411,7 @@  discard block
 block discarded – undo
411 411
     /**
412 412
      * Resolve perPage for pagination.
413 413
      *
414
-     * @param array|null $paginate
414
+     * @param Model $paginate
415 415
      *
416 416
      * @return array
417 417
      */
@@ -441,7 +441,7 @@  discard block
 block discarded – undo
441 441
     /**
442 442
      * Find query by method name.
443 443
      *
444
-     * @param $method
444
+     * @param string $method
445 445
      *
446 446
      * @return static
447 447
      */
@@ -534,7 +534,7 @@  discard block
 block discarded – undo
534 534
      *
535 535
      * @throws \Exception
536 536
      *
537
-     * @return array
537
+     * @return string[]
538 538
      */
539 539
     protected function joinParameters(Relation $relation)
540 540
     {
Please login to merge, or discard this patch.
src/Controllers/AuthController.php 2 patches
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
      *
35 35
      * @param Request $request
36 36
      *
37
-     * @return mixed
37
+     * @return \Illuminate\Http\RedirectResponse
38 38
      */
39 39
     public function postLogin(Request $request)
40 40
     {
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
     /**
63 63
      * User logout.
64 64
      *
65
-     * @return Redirect
65
+     * @return \Illuminate\Http\RedirectResponse
66 66
      */
67 67
     public function getLogout(Request $request)
68 68
     {
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
     /**
77 77
      * User setting page.
78 78
      *
79
-     * @return mixed
79
+     * @return Content
80 80
      */
81 81
     public function getSetting()
82 82
     {
@@ -167,7 +167,7 @@  discard block
 block discarded – undo
167 167
      *
168 168
      * @param \Illuminate\Http\Request $request
169 169
      *
170
-     * @return \Illuminate\Http\Response
170
+     * @return \Illuminate\Http\RedirectResponse
171 171
      */
172 172
     protected function sendLoginResponse(Request $request)
173 173
     {
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -80,11 +80,11 @@  discard block
 block discarded – undo
80 80
      */
81 81
     public function getSetting()
82 82
     {
83
-        return Admin::content(function (Content $content) {
83
+        return Admin::content(function(Content $content) {
84 84
             $content->header(trans('admin.user_setting'));
85 85
             $form = $this->settingForm();
86 86
             $form->tools(
87
-                function (Form\Tools $tools) {
87
+                function(Form\Tools $tools) {
88 88
                     $tools->disableBackButton();
89 89
                     $tools->disableListButton();
90 90
                 }
@@ -110,13 +110,13 @@  discard block
 block discarded – undo
110 110
      */
111 111
     protected function settingForm()
112 112
     {
113
-        return Administrator::form(function (Form $form) {
113
+        return Administrator::form(function(Form $form) {
114 114
             $form->display('username', trans('admin.username'));
115 115
             $form->text('name', trans('admin.name'))->rules('required');
116 116
             $form->image('avatar', trans('admin.avatar'));
117 117
             $form->password('password', trans('admin.password'))->rules('confirmed|required');
118 118
             $form->password('password_confirmation', trans('admin.password_confirmation'))->rules('required')
119
-                ->default(function ($form) {
119
+                ->default(function($form) {
120 120
                     return $form->model()->password;
121 121
                 });
122 122
 
@@ -124,13 +124,13 @@  discard block
 block discarded – undo
124 124
 
125 125
             $form->ignore(['password_confirmation']);
126 126
 
127
-            $form->saving(function (Form $form) {
127
+            $form->saving(function(Form $form) {
128 128
                 if ($form->password && $form->model()->password != $form->password) {
129 129
                     $form->password = bcrypt($form->password);
130 130
                 }
131 131
             });
132 132
 
133
-            $form->saved(function () {
133
+            $form->saved(function() {
134 134
                 admin_toastr(trans('admin.update_succeeded'));
135 135
 
136 136
                 return redirect(admin_url('auth/setting'));
Please login to merge, or discard this patch.
src/Form/Field.php 1 patch
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
     /**
203 203
      * Field constructor.
204 204
      *
205
-     * @param       $column
205
+     * @param       string $column
206 206
      * @param array $arguments
207 207
      */
208 208
     public function __construct($column, $arguments = [])
@@ -401,7 +401,7 @@  discard block
 block discarded – undo
401 401
     /**
402 402
      * Get or set rules.
403 403
      *
404
-     * @param null  $rules
404
+     * @param string  $rules
405 405
      * @param array $messages
406 406
      *
407 407
      * @return $this
@@ -494,7 +494,7 @@  discard block
 block discarded – undo
494 494
     /**
495 495
      * Set or get value of the field.
496 496
      *
497
-     * @param null $value
497
+     * @param string $value
498 498
      *
499 499
      * @return mixed
500 500
      */
@@ -647,7 +647,7 @@  discard block
 block discarded – undo
647 647
     /**
648 648
      * Add html attributes to elements.
649 649
      *
650
-     * @param array|string $attribute
650
+     * @param string $attribute
651 651
      * @param mixed        $value
652 652
      *
653 653
      * @return $this
Please login to merge, or discard this patch.
src/Controllers/MenuController.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -24,14 +24,14 @@  discard block
 block discarded – undo
24 24
      */
25 25
     public function index()
26 26
     {
27
-        return Admin::content(function (Content $content) {
27
+        return Admin::content(function(Content $content) {
28 28
             $content->header(trans('admin.menu'));
29 29
             $content->description(trans('admin.list'));
30 30
 
31
-            $content->row(function (Row $row) {
31
+            $content->row(function(Row $row) {
32 32
                 $row->column(6, $this->treeView()->render());
33 33
 
34
-                $row->column(6, function (Column $column) {
34
+                $row->column(6, function(Column $column) {
35 35
                     $form = new \Encore\Admin\Widgets\Form();
36 36
                     $form->action(admin_url('auth/menu'));
37 37
 
@@ -65,10 +65,10 @@  discard block
 block discarded – undo
65 65
      */
66 66
     protected function treeView()
67 67
     {
68
-        return Menu::tree(function (Tree $tree) {
68
+        return Menu::tree(function(Tree $tree) {
69 69
             $tree->disableCreate();
70 70
 
71
-            $tree->branch(function ($branch) {
71
+            $tree->branch(function($branch) {
72 72
                 $payload = "<i class='fa {$branch['icon']}'></i>&nbsp;<strong>{$branch['title']}</strong>";
73 73
 
74 74
                 if (!isset($branch['children'])) {
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
      */
96 96
     public function edit($id)
97 97
     {
98
-        return Admin::content(function (Content $content) use ($id) {
98
+        return Admin::content(function(Content $content) use ($id) {
99 99
             $content->header(trans('admin.menu'));
100 100
             $content->description(trans('admin.edit'));
101 101
 
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
      */
111 111
     public function form()
112 112
     {
113
-        return Menu::form(function (Form $form) {
113
+        return Menu::form(function(Form $form) {
114 114
             $form->display('id', 'ID');
115 115
 
116 116
             $form->select('parent_id', trans('admin.parent_id'))->options(Menu::selectOptions());
Please login to merge, or discard this patch.
src/Grid/HasElementNames.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -107,6 +107,7 @@
 block discarded – undo
107 107
     }
108 108
 
109 109
     /**
110
+     * @param string $name
110 111
      * @return string
111 112
      */
112 113
     protected function elementNameWithPrefix($name)
Please login to merge, or discard this patch.
src/Show.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -317,7 +317,7 @@
 block discarded – undo
317 317
      * @param string $method
318 318
      * @param array  $arguments
319 319
      *
320
-     * @return bool|mixed
320
+     * @return Field
321 321
      */
322 322
     public function __call($method, $arguments = [])
323 323
     {
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
183 183
 
184 184
         $this->overwriteExistingField($name);
185 185
 
186
-        return tap($field, function ($field) {
186
+        return tap($field, function($field) {
187 187
             $this->fields->push($field);
188 188
         });
189 189
     }
@@ -205,7 +205,7 @@  discard block
 block discarded – undo
205 205
 
206 206
         $this->overwriteExistingRelation($name);
207 207
 
208
-        return tap($relation, function ($relation) {
208
+        return tap($relation, function($relation) {
209 209
             $this->relations->push($relation);
210 210
         });
211 211
     }
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
         }
223 223
 
224 224
         $this->fields = $this->fields->filter(
225
-            function (Field $field) use ($name) {
225
+            function(Field $field) use ($name) {
226 226
                 return $field->getName() != $name;
227 227
             }
228 228
         );
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
         }
241 241
 
242 242
         $this->relations = $this->relations->filter(
243
-            function (Relation $relation) use ($name) {
243
+            function(Relation $relation) use ($name) {
244 244
                 return $relation->getName() != $name;
245 245
             }
246 246
         );
Please login to merge, or discard this patch.