Completed
Pull Request — master (#1384)
by Song
03:24 queued 01:05
created
src/Grid/Filter/Between.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@
 block discarded – undo
54 54
 
55 55
         $this->value = array_get($inputs, $this->column);
56 56
 
57
-        $value = array_filter($this->value, function ($val) {
57
+        $value = array_filter($this->value, function($val) {
58 58
             return $val !== '';
59 59
         });
60 60
 
Please login to merge, or discard this patch.
src/Grid/Filter/AbstractFilter.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -158,7 +158,7 @@
 block discarded – undo
158 158
 
159 159
         list($relation, $args[0]) = explode('.', $this->column);
160 160
 
161
-        return ['whereHas' => [$relation, function ($relation) use ($args) {
161
+        return ['whereHas' => [$relation, function($relation) use ($args) {
162 162
             call_user_func_array([$relation, $this->query], $args);
163 163
         }]];
164 164
     }
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -331,7 +331,7 @@
 block discarded – undo
331 331
      *
332 332
      * @param Presenter $presenter
333 333
      *
334
-     * @return mixed
334
+     * @return Presenter
335 335
      */
336 336
     protected function setPresenter(Presenter $presenter)
337 337
     {
Please login to merge, or discard this patch.
src/Grid/Row.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -134,7 +134,7 @@
 block discarded – undo
134 134
     public function style($style)
135 135
     {
136 136
         if (is_array($style)) {
137
-            $style = implode('', array_map(function ($key, $val) {
137
+            $style = implode('', array_map(function($key, $val) {
138 138
                 return "$key:$val";
139 139
             }, array_keys($style), array_values($style)));
140 140
         }
Please login to merge, or discard this patch.
src/Widgets/Box.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@
 block discarded – undo
64 64
             return $this->style([$styles]);
65 65
         }
66 66
 
67
-        $styles = array_map(function ($style) {
67
+        $styles = array_map(function($style) {
68 68
             return 'box-'.$style;
69 69
         }, $styles);
70 70
 
Please login to merge, or discard this patch.
src/Auth/Permission.php 2 patches
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
      *
13 13
      * @param $permission
14 14
      *
15
-     * @return true
15
+     * @return boolean|null
16 16
      */
17 17
     public static function check($permission)
18 18
     {
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
      *
31 31
      * @param $roles
32 32
      *
33
-     * @return true
33
+     * @return boolean|null
34 34
      */
35 35
     public static function allow($roles)
36 36
     {
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
      *
49 49
      * @param $roles
50 50
      *
51
-     * @return true
51
+     * @return boolean|null
52 52
      */
53 53
     public static function deny($roles)
54 54
     {
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@
 block discarded – undo
22 22
         }
23 23
 
24 24
         if (is_array($permission)) {
25
-            collect($permission)->each(function ($permission) {
25
+            collect($permission)->each(function($permission) {
26 26
                 call_user_func([Permission::class, 'check'], $permission);
27 27
             });
28 28
 
Please login to merge, or discard this patch.
src/Widgets/Form.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -117,7 +117,7 @@
 block discarded – undo
117 117
     /**
118 118
      * Add form attributes.
119 119
      *
120
-     * @param string|array $attr
120
+     * @param string $attr
121 121
      * @param string       $value
122 122
      *
123 123
      * @return $this
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
      */
163 163
     public function setWidth($fieldWidth = 8, $labelWidth = 2)
164 164
     {
165
-        collect($this->fields)->each(function ($field) use ($fieldWidth, $labelWidth) {
165
+        collect($this->fields)->each(function($field) use ($fieldWidth, $labelWidth) {
166 166
             /* @var Field $field  */
167 167
             $field->setWidth($fieldWidth, $labelWidth);
168 168
         });
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
      *
196 196
      * @return $this
197 197
      */
198
-    protected function pushField(Field &$field)
198
+    protected function pushField(Field & $field)
199 199
     {
200 200
         array_push($this->fields, $field);
201 201
 
Please login to merge, or discard this patch.
src/Grid/Model.php 2 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
     /**
241 241
      * Resolve perPage for pagination.
242 242
      *
243
-     * @param array|null $paginate
243
+     * @param Model $paginate
244 244
      *
245 245
      * @return array
246 246
      */
@@ -262,7 +262,7 @@  discard block
 block discarded – undo
262 262
     /**
263 263
      * Find query by method name.
264 264
      *
265
-     * @param $method
265
+     * @param string $method
266 266
      *
267 267
      * @return static
268 268
      */
Please login to merge, or discard this patch.
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';
450 450
         });
451 451
     }
Please login to merge, or discard this patch.
src/Console/MakeCommand.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@
 block discarded – undo
25 25
     /**
26 26
      * Execute the console command.
27 27
      *
28
-     * @return void
28
+     * @return false|null
29 29
      */
30 30
     public function handle()
31 31
     {
Please login to merge, or discard this patch.
src/Controllers/AuthController.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@
 block discarded – undo
58 58
     /**
59 59
      * User logout.
60 60
      *
61
-     * @return Redirect
61
+     * @return \Illuminate\Http\RedirectResponse
62 62
      */
63 63
     public function getLogout()
64 64
     {
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -76,11 +76,11 @@  discard block
 block discarded – undo
76 76
      */
77 77
     public function getSetting()
78 78
     {
79
-        return Admin::content(function (Content $content) {
79
+        return Admin::content(function(Content $content) {
80 80
             $content->header(trans('admin.user_setting'));
81 81
             $form = $this->settingForm();
82 82
             $form->tools(
83
-                function (Form\Tools $tools) {
83
+                function(Form\Tools $tools) {
84 84
                     $tools->disableBackButton();
85 85
                     $tools->disableListButton();
86 86
                 }
@@ -106,13 +106,13 @@  discard block
 block discarded – undo
106 106
      */
107 107
     protected function settingForm()
108 108
     {
109
-        return Administrator::form(function (Form $form) {
109
+        return Administrator::form(function(Form $form) {
110 110
             $form->display('username', trans('admin.username'));
111 111
             $form->text('name', trans('admin.name'))->rules('required');
112 112
             $form->image('avatar', trans('admin.avatar'));
113 113
             $form->password('password', trans('admin.password'))->rules('confirmed|required');
114 114
             $form->password('password_confirmation', trans('admin.password_confirmation'))->rules('required')
115
-                ->default(function ($form) {
115
+                ->default(function($form) {
116 116
                     return $form->model()->password;
117 117
                 });
118 118
 
@@ -120,13 +120,13 @@  discard block
 block discarded – undo
120 120
 
121 121
             $form->ignore(['password_confirmation']);
122 122
 
123
-            $form->saving(function (Form $form) {
123
+            $form->saving(function(Form $form) {
124 124
                 if ($form->password && $form->model()->password != $form->password) {
125 125
                     $form->password = bcrypt($form->password);
126 126
                 }
127 127
             });
128 128
 
129
-            $form->saved(function () {
129
+            $form->saved(function() {
130 130
                 admin_toastr(trans('admin.update_succeeded'));
131 131
 
132 132
                 return redirect(admin_base_path('auth/setting'));
Please login to merge, or discard this patch.