Completed
Pull Request — master (#5073)
by Song
05:21 queued 02:13
created
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   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
 
227 227
         $this->overwriteExistingField($name);
228 228
 
229
-        return tap($field, function ($field) {
229
+        return tap($field, function($field) {
230 230
             $this->fields->push($field);
231 231
         });
232 232
     }
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
248 248
 
249 249
         $this->overwriteExistingRelation($name);
250 250
 
251
-        return tap($relation, function ($relation) {
251
+        return tap($relation, function($relation) {
252 252
             $this->relations->push($relation);
253 253
         });
254 254
     }
@@ -265,7 +265,7 @@  discard block
 block discarded – undo
265 265
         }
266 266
 
267 267
         $this->fields = $this->fields->filter(
268
-            function (Field $field) use ($name) {
268
+            function(Field $field) use ($name) {
269 269
                 return $field->getName() != $name;
270 270
             }
271 271
         );
@@ -283,7 +283,7 @@  discard block
 block discarded – undo
283 283
         }
284 284
 
285 285
         $this->relations = $this->relations->filter(
286
-            function (Relation $relation) use ($name) {
286
+            function(Relation $relation) use ($name) {
287 287
                 return $relation->getName() != $name;
288 288
             }
289 289
         );
@@ -340,7 +340,7 @@  discard block
 block discarded – undo
340 340
      */
341 341
     public function setWidth($fieldWidth = 8, $labelWidth = 2)
342 342
     {
343
-        collect($this->fields)->each(function ($field) use ($fieldWidth, $labelWidth) {
343
+        collect($this->fields)->each(function($field) use ($fieldWidth, $labelWidth) {
344 344
             $field->setWidth($fieldWidth, $labelWidth);
345 345
         });
346 346
 
Please login to merge, or discard this patch.
src/Show/Field.php 2 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
     /**
89 89
      * Get name of this column.
90 90
      *
91
-     * @return mixed
91
+     * @return string
92 92
      */
93 93
     public function getName()
94 94
     {
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
     /**
113 113
      * Get label of the column.
114 114
      *
115
-     * @return mixed
115
+     * @return string
116 116
      */
117 117
     public function getLabel()
118 118
     {
Please login to merge, or discard this patch.
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
      */
193 193
     public function using(array $values, $default = null)
194 194
     {
195
-        return $this->as(function ($value) use ($values, $default) {
195
+        return $this->as(function($value) use ($values, $default) {
196 196
             if (is_null($value)) {
197 197
                 return $default;
198 198
             }
@@ -212,8 +212,8 @@  discard block
 block discarded – undo
212 212
      */
213 213
     public function image($server = '', $width = 200, $height = 200)
214 214
     {
215
-        return $this->unescape()->as(function ($images) use ($server, $width, $height) {
216
-            return collect($images)->map(function ($path) use ($server, $width, $height) {
215
+        return $this->unescape()->as(function($images) use ($server, $width, $height) {
216
+            return collect($images)->map(function($path) use ($server, $width, $height) {
217 217
                 if (empty($path)) {
218 218
                     return '';
219 219
                 }
@@ -248,8 +248,8 @@  discard block
 block discarded – undo
248 248
      */
249 249
     public function carousel($width = 300, $height = 200, $server = '')
250 250
     {
251
-        return $this->unescape()->as(function ($images) use ($server, $width, $height) {
252
-            $items = collect($images)->map(function ($path) use ($server, $width, $height) {
251
+        return $this->unescape()->as(function($images) use ($server, $width, $height) {
252
+            $items = collect($images)->map(function($path) use ($server, $width, $height) {
253 253
                 if (empty($path)) {
254 254
                     return '';
255 255
                 }
@@ -289,7 +289,7 @@  discard block
 block discarded – undo
289 289
     {
290 290
         $field = $this;
291 291
 
292
-        return $this->unescape()->as(function ($path) use ($server, $download, $field) {
292
+        return $this->unescape()->as(function($path) use ($server, $download, $field) {
293 293
             $name = basename($path);
294 294
 
295 295
             $field->border = false;
@@ -343,7 +343,7 @@  discard block
 block discarded – undo
343 343
      */
344 344
     public function link($href = '', $target = '_blank')
345 345
     {
346
-        return $this->unescape()->as(function ($link) use ($href, $target) {
346
+        return $this->unescape()->as(function($link) use ($href, $target) {
347 347
             $href = $href ?: $link;
348 348
 
349 349
             return "<a href='$href' target='{$target}'>{$link}</a>";
@@ -359,12 +359,12 @@  discard block
 block discarded – undo
359 359
      */
360 360
     public function label($style = 'success')
361 361
     {
362
-        return $this->unescape()->as(function ($value) use ($style) {
362
+        return $this->unescape()->as(function($value) use ($style) {
363 363
             if ($value instanceof Arrayable) {
364 364
                 $value = $value->toArray();
365 365
             }
366 366
 
367
-            return collect((array) $value)->map(function ($name) use ($style) {
367
+            return collect((array) $value)->map(function($name) use ($style) {
368 368
                 return "<span class='label label-{$style}'>$name</span>";
369 369
             })->implode('&nbsp;');
370 370
         });
@@ -379,12 +379,12 @@  discard block
 block discarded – undo
379 379
      */
380 380
     public function badge($style = 'blue')
381 381
     {
382
-        return $this->unescape()->as(function ($value) use ($style) {
382
+        return $this->unescape()->as(function($value) use ($style) {
383 383
             if ($value instanceof Arrayable) {
384 384
                 $value = $value->toArray();
385 385
             }
386 386
 
387
-            return collect((array) $value)->map(function ($name) use ($style) {
387
+            return collect((array) $value)->map(function($name) use ($style) {
388 388
                 return "<span class='badge bg-{$style}'>$name</span>";
389 389
             })->implode('&nbsp;');
390 390
         });
@@ -399,7 +399,7 @@  discard block
 block discarded – undo
399 399
     {
400 400
         $field = $this;
401 401
 
402
-        return $this->unescape()->as(function ($value) use ($field) {
402
+        return $this->unescape()->as(function($value) use ($field) {
403 403
             if (is_string($value)) {
404 404
                 $content = json_decode($value, true);
405 405
             } else {
@@ -423,7 +423,7 @@  discard block
 block discarded – undo
423 423
      */
424 424
     public function filesize()
425 425
     {
426
-        return $this->as(function ($value) {
426
+        return $this->as(function($value) {
427 427
             return file_size($value);
428 428
         });
429 429
     }
@@ -581,7 +581,7 @@  discard block
 block discarded – undo
581 581
 
582 582
         $field = $this;
583 583
 
584
-        return $this->as(function ($value) use ($extend, $field, $arguments) {
584
+        return $this->as(function($value) use ($extend, $field, $arguments) {
585 585
             if (!$extend->border) {
586 586
                 $field->border = false;
587 587
             }
@@ -640,7 +640,7 @@  discard block
 block discarded – undo
640 640
     public function render()
641 641
     {
642 642
         if ($this->showAs->isNotEmpty()) {
643
-            $this->showAs->each(function ($callable) {
643
+            $this->showAs->each(function($callable) {
644 644
                 $this->value = $callable->call(
645 645
                     $this->parent->getModel(),
646 646
                     $this->value
Please login to merge, or discard this patch.
src/Show/Panel.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -138,7 +138,7 @@
 block discarded – undo
138 138
     /**
139 139
      * Fill fields to panel.
140 140
      *
141
-     * @param []Field $fields
141
+     * @param Collection $fields
142 142
      *
143 143
      * @return $this
144 144
      */
Please login to merge, or discard this patch.
src/Grid/Tools/BatchActions.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@
 block discarded – undo
52 52
     /**
53 53
      * Add a batch action.
54 54
      *
55
-     * @param $title
55
+     * @param BatchDelete $title
56 56
      * @param BatchAction|null $action
57 57
      *
58 58
      * @return $this
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -102,7 +102,7 @@
 block discarded – undo
102 102
      */
103 103
     protected function addActionScripts()
104 104
     {
105
-        $this->actions->each(function ($action) {
105
+        $this->actions->each(function($action) {
106 106
             $action->setGrid($this->grid);
107 107
 
108 108
             if (method_exists($action, 'script')) {
Please login to merge, or discard this patch.
src/Grid/Filter/Scope.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@
 block discarded – undo
55 55
      */
56 56
     public function condition()
57 57
     {
58
-        return $this->queries->map(function ($query) {
58
+        return $this->queries->map(function($query) {
59 59
             return [$query['method'] => $query['arguments']];
60 60
         })->toArray();
61 61
     }
Please login to merge, or discard this patch.
src/Form/Tools.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -288,7 +288,7 @@
 block discarded – undo
288 288
             return '';
289 289
         }
290 290
 
291
-        return $tools->map(function ($tool) {
291
+        return $tools->map(function($tool) {
292 292
             if ($tool instanceof Renderable) {
293 293
                 return $tool->render();
294 294
             }
Please login to merge, or discard this patch.
src/Show/Tools.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -275,7 +275,7 @@
 block discarded – undo
275 275
      */
276 276
     protected function renderCustomTools($tools)
277 277
     {
278
-        return $tools->map(function ($tool) {
278
+        return $tools->map(function($tool) {
279 279
             if ($tool instanceof Renderable) {
280 280
                 return $tool->render();
281 281
             }
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -289,7 +289,7 @@
 block discarded – undo
289 289
      *
290 290
      * @param Collection $tools
291 291
      *
292
-     * @return mixed
292
+     * @return string
293 293
      */
294 294
     protected function renderCustomTools($tools)
295 295
     {
Please login to merge, or discard this patch.
src/Controllers/AuthController.php 2 patches
Doc Comments   +3 added lines, -3 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
     {
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
      *
171 171
      * @param \Illuminate\Http\Request $request
172 172
      *
173
-     * @return \Illuminate\Http\Response
173
+     * @return \Illuminate\Http\RedirectResponse
174 174
      */
175 175
     protected function sendLoginResponse(Request $request)
176 176
     {
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
     {
96 96
         $form = $this->settingForm();
97 97
         $form->tools(
98
-            function (Form\Tools $tools) {
98
+            function(Form\Tools $tools) {
99 99
                 $tools->disableList();
100 100
                 $tools->disableDelete();
101 101
                 $tools->disableView();
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
         $form->image('avatar', trans('admin.avatar'));
134 134
         $form->password('password', trans('admin.password'))->rules('confirmed|required');
135 135
         $form->password('password_confirmation', trans('admin.password_confirmation'))->rules('required')
136
-            ->default(function ($form) {
136
+            ->default(function($form) {
137 137
                 return $form->model()->password;
138 138
             });
139 139
 
@@ -141,13 +141,13 @@  discard block
 block discarded – undo
141 141
 
142 142
         $form->ignore(['password_confirmation']);
143 143
 
144
-        $form->saving(function (Form $form) {
144
+        $form->saving(function(Form $form) {
145 145
             if ($form->password && $form->model()->password != $form->password) {
146 146
                 $form->password = bcrypt($form->password);
147 147
             }
148 148
         });
149 149
 
150
-        $form->saved(function () {
150
+        $form->saved(function() {
151 151
             admin_toastr(trans('admin.update_succeeded'));
152 152
 
153 153
             return redirect(admin_url('auth/setting'));
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.