Skip to content

Commit

Permalink
Fix styling
Browse files Browse the repository at this point in the history
  • Loading branch information
freekmurze authored and actions-user committed Nov 17, 2021
1 parent fb9e680 commit 10d4c14
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
6 changes: 3 additions & 3 deletions src/Traits/HasPermissions.php
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,13 @@ public function scopePermission(Builder $query, $permissions): Builder
return $query->where(function (Builder $query) use ($permissions, $rolesWithPermissions) {
$query->whereHas('permissions', function (Builder $subQuery) use ($permissions) {
$permissionClass = $this->getPermissionClass();
$key = (new $permissionClass)->getKeyName();
$key = (new $permissionClass())->getKeyName();
$subQuery->whereIn(config('permission.table_names.permissions').".$key", \array_column($permissions, $key));
});
if (count($rolesWithPermissions) > 0) {
$query->orWhereHas('roles', function (Builder $subQuery) use ($rolesWithPermissions) {
$roleClass = $this->getRoleClass();
$key = (new $roleClass)->getKeyName();
$key = (new $roleClass())->getKeyName();
$subQuery->whereIn(config('permission.table_names.roles').".$key", \array_column($rolesWithPermissions, $key));
});
}
Expand Down Expand Up @@ -359,7 +359,7 @@ public function givePermissionTo(...$permissions)
[PermissionRegistrar::$teamsKey => app(PermissionRegistrar::class)->getPermissionsTeamId()] : [],
];
})
->pluck('values', (new $permissionClass)->getKeyName())->toArray();
->pluck('values', (new $permissionClass())->getKeyName())->toArray();

$model = $this->getModel();

Expand Down
7 changes: 4 additions & 3 deletions src/Traits/HasRoles.php
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public function scopeRole(Builder $query, $roles, $guard = null): Builder

return $query->whereHas('roles', function (Builder $subQuery) use ($roles) {
$roleClass = $this->getRoleClass();
$key = (new $roleClass)->getKeyName();
$key = (new $roleClass())->getKeyName();
$subQuery->whereIn(config('permission.table_names.roles').".$key", \array_column($roles, $key));
});
}
Expand Down Expand Up @@ -143,7 +143,7 @@ public function assignRole(...$roles)
[PermissionRegistrar::$teamsKey => app(PermissionRegistrar::class)->getPermissionsTeamId()] : [],
];
})
->pluck('values', (new $roleClass)->getKeyName())->toArray();
->pluck('values', (new $roleClass())->getKeyName())->toArray();

$model = $this->getModel();

Expand Down Expand Up @@ -224,7 +224,8 @@ public function hasRole($roles, string $guard = null): bool

if (is_int($roles)) {
$roleClass = $this->getRoleClass();
$key = (new $roleClass)->getKeyName();
$key = (new $roleClass())->getKeyName();

return $guard
? $this->roles->where('guard_name', $guard)->contains($key, $roles)
: $this->roles->contains($key, $roles);
Expand Down

0 comments on commit 10d4c14

Please sign in to comment.