@@ -390,7 +390,7 @@ |
||
390 | 390 | * |
391 | 391 | * @param $name |
392 | 392 | * @param $slug |
393 | - * @param $path |
|
393 | + * @param string $path |
|
394 | 394 | * @param array $methods |
395 | 395 | */ |
396 | 396 | protected static function createPermission($name, $slug, $path, $methods = []) |
@@ -236,7 +236,7 @@ |
||
236 | 236 | public static function import() |
237 | 237 | { |
238 | 238 | $extension = static::getInstance(); |
239 | - DB::transaction(function () use ($extension) { |
|
239 | + DB::transaction(function() use ($extension) { |
|
240 | 240 | if ($menu = $extension->menu()) { |
241 | 241 | if ($extension->validateMenu($menu)) { |
242 | 242 | extract($menu); |
@@ -89,7 +89,7 @@ |
||
89 | 89 | /** |
90 | 90 | * Remove reserved fields from form layout. |
91 | 91 | * |
92 | - * @param array $fields |
|
92 | + * @param string[] $fields |
|
93 | 93 | */ |
94 | 94 | public function removeReservedFields(array $fields) |
95 | 95 | { |
@@ -48,7 +48,7 @@ |
||
48 | 48 | */ |
49 | 49 | public function removeFields($fields) |
50 | 50 | { |
51 | - $this->fields = $this->fields->reject(function (Field $field) use ($fields) { |
|
51 | + $this->fields = $this->fields->reject(function(Field $field) use ($fields) { |
|
52 | 52 | return in_array($field->column(), $fields); |
53 | 53 | }); |
54 | 54 | } |
@@ -42,7 +42,7 @@ |
||
42 | 42 | if (empty($selectedOption)) { |
43 | 43 | $selected = $this->choice('Please choose a role for the user', $selectedOption, null, null, true); |
44 | 44 | |
45 | - $roles = $roles->filter(function ($role) use ($selected) { |
|
45 | + $roles = $roles->filter(function($role) use ($selected) { |
|
46 | 46 | return in_array($role->name, $selected); |
47 | 47 | }); |
48 | 48 | } |
@@ -45,7 +45,7 @@ |
||
45 | 45 | } |
46 | 46 | |
47 | 47 | /** |
48 | - * @return mixed |
|
48 | + * @return string |
|
49 | 49 | */ |
50 | 50 | protected function getModelClass() |
51 | 51 | { |
@@ -91,7 +91,7 @@ |
||
91 | 91 | * |
92 | 92 | * @param string $path |
93 | 93 | * |
94 | - * @return mixed |
|
94 | + * @return string |
|
95 | 95 | */ |
96 | 96 | public function getHttpPathAttribute($path) |
97 | 97 | { |
@@ -2,10 +2,10 @@ |
||
2 | 2 | |
3 | 3 | namespace Encore\Admin\Auth\Database; |
4 | 4 | |
5 | -use Encore\Admin\Traits\DefaultDatetimeFormat; |
|
6 | -use Illuminate\Database\Eloquent\Model; |
|
7 | -use Illuminate\Database\Eloquent\Relations\BelongsToMany; |
|
8 | -use Illuminate\Http\Request; |
|
5 | +use Encore\Admin\Traits\DefaultDatetimeFormat; |
|
6 | +use Illuminate\Database\Eloquent\Model; |
|
7 | +use Illuminate\Database\Eloquent\Relations\BelongsToMany; |
|
8 | +use Illuminate\Http\Request; |
|
9 | 9 | use Illuminate\Support\Str; |
10 | 10 | |
11 | 11 | class Permission extends Model |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | { |
66 | 66 | $method = $this->http_method; |
67 | 67 | |
68 | - $matches = array_map(function ($path) use ($method) { |
|
68 | + $matches = array_map(function($path) use ($method) { |
|
69 | 69 | $path = trim(config('admin.route.prefix'), '/').$path; |
70 | 70 | |
71 | 71 | if (Str::contains($path, ':')) { |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | return false; |
118 | 118 | } |
119 | 119 | |
120 | - $method = collect($match['method'])->filter()->map(function ($method) { |
|
120 | + $method = collect($match['method'])->filter()->map(function($method) { |
|
121 | 121 | return strtoupper($method); |
122 | 122 | }); |
123 | 123 | |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | { |
158 | 158 | parent::boot(); |
159 | 159 | |
160 | - static::deleting(function ($model) { |
|
160 | + static::deleting(function($model) { |
|
161 | 161 | $model->roles()->detach(); |
162 | 162 | }); |
163 | 163 | } |
@@ -112,7 +112,7 @@ |
||
112 | 112 | */ |
113 | 113 | protected static function bootHasPermissions() |
114 | 114 | { |
115 | - static::deleting(function ($model) { |
|
115 | + static::deleting(function($model) { |
|
116 | 116 | $model->roles()->detach(); |
117 | 117 | |
118 | 118 | $model->permissions()->detach(); |
@@ -9,7 +9,7 @@ discard block |
||
9 | 9 | /** |
10 | 10 | * Get all permissions of user. |
11 | 11 | * |
12 | - * @return mixed |
|
12 | + * @return Collection |
|
13 | 13 | */ |
14 | 14 | public function allPermissions(): Collection |
15 | 15 | { |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | /** |
20 | 20 | * Check if user has permission. |
21 | 21 | * |
22 | - * @param $ability |
|
22 | + * @param string $ability |
|
23 | 23 | * @param array $arguments |
24 | 24 | * |
25 | 25 | * @return bool |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | /** |
57 | 57 | * Check if user is administrator. |
58 | 58 | * |
59 | - * @return mixed |
|
59 | + * @return boolean |
|
60 | 60 | */ |
61 | 61 | public function isAdministrator(): bool |
62 | 62 | { |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | * |
69 | 69 | * @param string $role |
70 | 70 | * |
71 | - * @return mixed |
|
71 | + * @return boolean |
|
72 | 72 | */ |
73 | 73 | public function isRole(string $role): bool |
74 | 74 | { |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | * |
81 | 81 | * @param array $roles |
82 | 82 | * |
83 | - * @return mixed |
|
83 | + * @return boolean |
|
84 | 84 | */ |
85 | 85 | public function inRoles(array $roles = []): bool |
86 | 86 | { |
@@ -347,9 +347,9 @@ discard block |
||
347 | 347 | |
348 | 348 | $this->setSort(); |
349 | 349 | |
350 | - $this->queries->reject(function ($query) { |
|
350 | + $this->queries->reject(function($query) { |
|
351 | 351 | return $query['method'] == 'paginate'; |
352 | - })->each(function ($query) { |
|
352 | + })->each(function($query) { |
|
353 | 353 | $this->model = $this->model->{$query['method']}(...$query['arguments']); |
354 | 354 | }); |
355 | 355 | |
@@ -400,7 +400,7 @@ discard block |
||
400 | 400 | $this->setSort(); |
401 | 401 | $this->setPaginate(); |
402 | 402 | |
403 | - $this->queries->unique()->each(function ($query) { |
|
403 | + $this->queries->unique()->each(function($query) { |
|
404 | 404 | $this->model = call_user_func_array([$this->model, $query['method']], $query['arguments']); |
405 | 405 | }); |
406 | 406 | |
@@ -430,9 +430,9 @@ discard block |
||
430 | 430 | |
431 | 431 | $queryBuilder = $this->originalModel; |
432 | 432 | |
433 | - $this->queries->reject(function ($query) { |
|
433 | + $this->queries->reject(function($query) { |
|
434 | 434 | return in_array($query['method'], ['get', 'paginate']); |
435 | - })->each(function ($query) use (&$queryBuilder) { |
|
435 | + })->each(function($query) use (&$queryBuilder) { |
|
436 | 436 | $queryBuilder = $queryBuilder->{$query['method']}(...$query['arguments']); |
437 | 437 | }); |
438 | 438 | |
@@ -466,7 +466,7 @@ discard block |
||
466 | 466 | { |
467 | 467 | $paginate = $this->findQueryByMethod('paginate'); |
468 | 468 | |
469 | - $this->queries = $this->queries->reject(function ($query) { |
|
469 | + $this->queries = $this->queries->reject(function($query) { |
|
470 | 470 | return $query['method'] == 'paginate'; |
471 | 471 | }); |
472 | 472 | |
@@ -524,7 +524,7 @@ discard block |
||
524 | 524 | */ |
525 | 525 | protected function findQueryByMethod($method) |
526 | 526 | { |
527 | - return $this->queries->first(function ($query) use ($method) { |
|
527 | + return $this->queries->first(function($query) use ($method) { |
|
528 | 528 | return $query['method'] == $method; |
529 | 529 | }); |
530 | 530 | } |
@@ -547,7 +547,7 @@ discard block |
||
547 | 547 | } |
548 | 548 | |
549 | 549 | $columnNameContainsDots = Str::contains($columnName, '.'); |
550 | - $isRelation = $this->queries->contains(function ($query) use ($columnName) { |
|
550 | + $isRelation = $this->queries->contains(function($query) use ($columnName) { |
|
551 | 551 | return $query['method'] === 'with' && in_array($columnName, $query['arguments'], true); |
552 | 552 | }); |
553 | 553 | if ($columnNameContainsDots === true && $isRelation) { |
@@ -593,7 +593,7 @@ discard block |
||
593 | 593 | { |
594 | 594 | list($relationName, $relationColumn) = explode('.', $column); |
595 | 595 | |
596 | - if ($this->queries->contains(function ($query) use ($relationName) { |
|
596 | + if ($this->queries->contains(function($query) use ($relationName) { |
|
597 | 597 | return $query['method'] == 'with' && in_array($relationName, $query['arguments']); |
598 | 598 | })) { |
599 | 599 | $relation = $this->model->$relationName(); |
@@ -627,7 +627,7 @@ discard block |
||
627 | 627 | */ |
628 | 628 | public function resetOrderBy() |
629 | 629 | { |
630 | - $this->queries = $this->queries->reject(function ($query) { |
|
630 | + $this->queries = $this->queries->reject(function($query) { |
|
631 | 631 | return $query['method'] == 'orderBy' || $query['method'] == 'orderByDesc'; |
632 | 632 | }); |
633 | 633 | } |
@@ -467,7 +467,7 @@ discard block |
||
467 | 467 | /** |
468 | 468 | * Resolve perPage for pagination. |
469 | 469 | * |
470 | - * @param array|null $paginate |
|
470 | + * @param Model $paginate |
|
471 | 471 | * |
472 | 472 | * @return array |
473 | 473 | */ |
@@ -497,7 +497,7 @@ discard block |
||
497 | 497 | /** |
498 | 498 | * Find query by method name. |
499 | 499 | * |
500 | - * @param $method |
|
500 | + * @param string $method |
|
501 | 501 | * |
502 | 502 | * @return static |
503 | 503 | */ |
@@ -651,7 +651,7 @@ discard block |
||
651 | 651 | |
652 | 652 | /** |
653 | 653 | * @param string $method |
654 | - * @param array $arguments |
|
654 | + * @param integer[] $arguments |
|
655 | 655 | * |
656 | 656 | * @return $this |
657 | 657 | */ |
@@ -13,7 +13,7 @@ |
||
13 | 13 | * @param array $forms |
14 | 14 | * @param null $active |
15 | 15 | * |
16 | - * @return mixed |
|
16 | + * @return ContainsForms |
|
17 | 17 | */ |
18 | 18 | public static function forms($forms, $active = null) |
19 | 19 | { |