@@ -2,13 +2,13 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Spatie\Permission; |
| 4 | 4 | |
| 5 | +use Illuminate\Filesystem\Filesystem; |
|
| 5 | 6 | use Illuminate\Routing\Route; |
| 6 | 7 | use Illuminate\Support\Collection; |
| 7 | -use Illuminate\Filesystem\Filesystem; |
|
| 8 | 8 | use Illuminate\Support\ServiceProvider; |
| 9 | 9 | use Illuminate\View\Compilers\BladeCompiler; |
| 10 | -use Spatie\Permission\Contracts\Role as RoleContract; |
|
| 11 | 10 | use Spatie\Permission\Contracts\Permission as PermissionContract; |
| 11 | +use Spatie\Permission\Contracts\Role as RoleContract; |
|
| 12 | 12 | |
| 13 | 13 | class PermissionServiceProvider extends ServiceProvider |
| 14 | 14 | { |
@@ -3,11 +3,11 @@ |
||
| 3 | 3 | namespace Spatie\Permission; |
| 4 | 4 | |
| 5 | 5 | use Illuminate\Cache\CacheManager; |
| 6 | -use Illuminate\Support\Collection; |
|
| 7 | -use Spatie\Permission\Contracts\Role; |
|
| 6 | +use Illuminate\Contracts\Auth\Access\Authorizable; |
|
| 8 | 7 | use Illuminate\Contracts\Auth\Access\Gate; |
| 8 | +use Illuminate\Support\Collection; |
|
| 9 | 9 | use Spatie\Permission\Contracts\Permission; |
| 10 | -use Illuminate\Contracts\Auth\Access\Authorizable; |
|
| 10 | +use Spatie\Permission\Contracts\Role; |
|
| 11 | 11 | |
| 12 | 12 | class PermissionRegistrar |
| 13 | 13 | { |
@@ -34,7 +34,7 @@ |
||
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | /** |
| 37 | - * @param string|WildcardPermission $permission |
|
| 37 | + * @param string $permission |
|
| 38 | 38 | * |
| 39 | 39 | * @return bool |
| 40 | 40 | */ |
@@ -4,8 +4,8 @@ |
||
| 4 | 4 | |
| 5 | 5 | use Illuminate\Console\Command; |
| 6 | 6 | use Illuminate\Support\Collection; |
| 7 | -use Spatie\Permission\Contracts\Role as RoleContract; |
|
| 8 | 7 | use Spatie\Permission\Contracts\Permission as PermissionContract; |
| 8 | +use Spatie\Permission\Contracts\Role as RoleContract; |
|
| 9 | 9 | |
| 10 | 10 | class Show extends Command |
| 11 | 11 | { |
@@ -2,16 +2,16 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Spatie\Permission\Models; |
| 4 | 4 | |
| 5 | -use Spatie\Permission\Guard; |
|
| 6 | -use Illuminate\Support\Collection; |
|
| 7 | -use Spatie\Permission\Traits\HasRoles; |
|
| 8 | 5 | use Illuminate\Database\Eloquent\Model; |
| 9 | -use Spatie\Permission\PermissionRegistrar; |
|
| 10 | -use Spatie\Permission\Traits\RefreshesPermissionCache; |
|
| 11 | -use Spatie\Permission\Exceptions\PermissionDoesNotExist; |
|
| 12 | 6 | use Illuminate\Database\Eloquent\Relations\BelongsToMany; |
| 13 | -use Spatie\Permission\Exceptions\PermissionAlreadyExists; |
|
| 7 | +use Illuminate\Support\Collection; |
|
| 14 | 8 | use Spatie\Permission\Contracts\Permission as PermissionContract; |
| 9 | +use Spatie\Permission\Exceptions\PermissionAlreadyExists; |
|
| 10 | +use Spatie\Permission\Exceptions\PermissionDoesNotExist; |
|
| 11 | +use Spatie\Permission\Guard; |
|
| 12 | +use Spatie\Permission\PermissionRegistrar; |
|
| 13 | +use Spatie\Permission\Traits\HasRoles; |
|
| 14 | +use Spatie\Permission\Traits\RefreshesPermissionCache; |
|
| 15 | 15 | |
| 16 | 16 | class Permission extends Model implements PermissionContract |
| 17 | 17 | { |
@@ -2,15 +2,15 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Spatie\Permission\Models; |
| 4 | 4 | |
| 5 | -use Spatie\Permission\Guard; |
|
| 6 | 5 | use Illuminate\Database\Eloquent\Model; |
| 7 | -use Spatie\Permission\Traits\HasPermissions; |
|
| 8 | -use Spatie\Permission\Exceptions\RoleDoesNotExist; |
|
| 6 | +use Illuminate\Database\Eloquent\Relations\BelongsToMany; |
|
| 7 | +use Spatie\Permission\Contracts\Role as RoleContract; |
|
| 9 | 8 | use Spatie\Permission\Exceptions\GuardDoesNotMatch; |
| 10 | 9 | use Spatie\Permission\Exceptions\RoleAlreadyExists; |
| 11 | -use Spatie\Permission\Contracts\Role as RoleContract; |
|
| 10 | +use Spatie\Permission\Exceptions\RoleDoesNotExist; |
|
| 11 | +use Spatie\Permission\Guard; |
|
| 12 | +use Spatie\Permission\Traits\HasPermissions; |
|
| 12 | 13 | use Spatie\Permission\Traits\RefreshesPermissionCache; |
| 13 | -use Illuminate\Database\Eloquent\Relations\BelongsToMany; |
|
| 14 | 14 | |
| 15 | 15 | class Role extends Model implements RoleContract |
| 16 | 16 | { |
@@ -2,16 +2,16 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Spatie\Permission\Traits; |
| 4 | 4 | |
| 5 | -use Spatie\Permission\Guard; |
|
| 6 | -use Illuminate\Support\Collection; |
|
| 7 | 5 | use Illuminate\Database\Eloquent\Builder; |
| 8 | -use Spatie\Permission\WildcardPermission; |
|
| 9 | -use Spatie\Permission\PermissionRegistrar; |
|
| 6 | +use Illuminate\Database\Eloquent\Relations\BelongsToMany; |
|
| 7 | +use Illuminate\Support\Collection; |
|
| 10 | 8 | use Spatie\Permission\Contracts\Permission; |
| 11 | 9 | use Spatie\Permission\Exceptions\GuardDoesNotMatch; |
| 12 | 10 | use Spatie\Permission\Exceptions\PermissionDoesNotExist; |
| 13 | -use Illuminate\Database\Eloquent\Relations\BelongsToMany; |
|
| 14 | 11 | use Spatie\Permission\Exceptions\WildcardPermissionInvalidArgument; |
| 12 | +use Spatie\Permission\Guard; |
|
| 13 | +use Spatie\Permission\PermissionRegistrar; |
|
| 14 | +use Spatie\Permission\WildcardPermission; |
|
| 15 | 15 | |
| 16 | 16 | trait HasPermissions |
| 17 | 17 | { |
@@ -2,11 +2,11 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Spatie\Permission\Traits; |
| 4 | 4 | |
| 5 | +use Illuminate\Database\Eloquent\Builder; |
|
| 6 | +use Illuminate\Database\Eloquent\Relations\BelongsToMany; |
|
| 5 | 7 | use Illuminate\Support\Collection; |
| 6 | 8 | use Spatie\Permission\Contracts\Role; |
| 7 | -use Illuminate\Database\Eloquent\Builder; |
|
| 8 | 9 | use Spatie\Permission\PermissionRegistrar; |
| 9 | -use Illuminate\Database\Eloquent\Relations\BelongsToMany; |
|
| 10 | 10 | |
| 11 | 11 | trait HasRoles |
| 12 | 12 | { |