Completed
Pull Request — master (#2448)
by jxlwqq
02:39
created
src/Middleware/Permission.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
             return $next($request);
34 34
         }
35 35
 
36
-        if (!Admin::user()->allPermissions()->first(function ($permission) use ($request) {
36
+        if (!Admin::user()->allPermissions()->first(function($permission) use ($request) {
37 37
             return $permission->shouldPassThrough($request);
38 38
         })) {
39 39
             Checker::error();
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
      */
53 53
     public function checkRoutePermission(Request $request)
54 54
     {
55
-        if (!$middleware = collect($request->route()->middleware())->first(function ($middleware) {
55
+        if (!$middleware = collect($request->route()->middleware())->first(function($middleware) {
56 56
             return Str::startsWith($middleware, $this->middlewarePrefix);
57 57
         })) {
58 58
             return false;
Please login to merge, or discard this patch.
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/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.
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   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
      */
173 173
     public function using(array $values, $default = null)
174 174
     {
175
-        return $this->as(function ($value) use ($values, $default) {
175
+        return $this->as(function($value) use ($values, $default) {
176 176
             if (is_null($value)) {
177 177
                 return $default;
178 178
             }
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
      */
193 193
     public function image($server = '', $width = 200, $height = 200)
194 194
     {
195
-        return $this->as(function ($path) use ($server, $width, $height) {
195
+        return $this->as(function($path) use ($server, $width, $height) {
196 196
             if (empty($path)) {
197 197
                 return '';
198 198
             }
@@ -227,7 +227,7 @@  discard block
 block discarded – undo
227 227
     {
228 228
         $field = $this;
229 229
 
230
-        return $this->as(function ($path) use ($server, $download, $field) {
230
+        return $this->as(function($path) use ($server, $download, $field) {
231 231
             $name = basename($path);
232 232
 
233 233
             $field->wrapped = false;
@@ -275,7 +275,7 @@  discard block
 block discarded – undo
275 275
      */
276 276
     public function link($href = '', $target = '_blank')
277 277
     {
278
-        return $this->as(function ($link) use ($href, $target) {
278
+        return $this->as(function($link) use ($href, $target) {
279 279
             $href = $href ?: $link;
280 280
 
281 281
             return "<a href='$href' target='{$target}'>{$link}</a>";
@@ -291,12 +291,12 @@  discard block
 block discarded – undo
291 291
      */
292 292
     public function label($style = 'success')
293 293
     {
294
-        return $this->as(function ($value) use ($style) {
294
+        return $this->as(function($value) use ($style) {
295 295
             if ($value instanceof Arrayable) {
296 296
                 $value = $value->toArray();
297 297
             }
298 298
 
299
-            return collect((array) $value)->map(function ($name) use ($style) {
299
+            return collect((array) $value)->map(function($name) use ($style) {
300 300
                 return "<span class='label label-{$style}'>$name</span>";
301 301
             })->implode('&nbsp;');
302 302
         });
@@ -311,12 +311,12 @@  discard block
 block discarded – undo
311 311
      */
312 312
     public function badge($style = 'blue')
313 313
     {
314
-        return $this->as(function ($value) use ($style) {
314
+        return $this->as(function($value) use ($style) {
315 315
             if ($value instanceof Arrayable) {
316 316
                 $value = $value->toArray();
317 317
             }
318 318
 
319
-            return collect((array) $value)->map(function ($name) use ($style) {
319
+            return collect((array) $value)->map(function($name) use ($style) {
320 320
                 return "<span class='badge bg-{$style}'>$name</span>";
321 321
             })->implode('&nbsp;');
322 322
         });
@@ -331,7 +331,7 @@  discard block
 block discarded – undo
331 331
     {
332 332
         $field = $this;
333 333
 
334
-        return $this->as(function ($value) use ($field) {
334
+        return $this->as(function($value) use ($field) {
335 335
             $content = json_decode($value, true);
336 336
 
337 337
             if (json_last_error() == 0) {
@@ -442,7 +442,7 @@  discard block
 block discarded – undo
442 442
     public function render()
443 443
     {
444 444
         if ($this->showAs->isNotEmpty()) {
445
-            $this->showAs->each(function ($callable) {
445
+            $this->showAs->each(function($callable) {
446 446
                 $this->value = $callable->call(
447 447
                     $this->parent->getModel(),
448 448
                     $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.