Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[v6][BC] Fix Role->hasPermissionTo() signature to match HasPermissions trait #2380

Merged
merged 1 commit into from Mar 30, 2023

Conversation

erikn69
Copy link
Contributor

@erikn69 erikn69 commented Mar 30, 2023

Maybe a breking change

Role model uses HasPermissions trait, and overwrites hasPermissionTo method

public function hasPermissionTo($permission, $guardName = null): bool
{
if ($this->getWildcardClass()) {
return $this->hasWildcardPermission($permission, $guardName);
}
$permission = $this->filterPermission($permission, $guardName);
return $this->hasDirectPermission($permission) || $this->hasPermissionViaRole($permission);
}

Also re-using filterPermission fix UUID/ULID support
public function filterPermission($permission, $guardName = null)
{
if (is_string($permission) && ! PermissionRegistrar::isUid($permission)) {
$permission = $this->getPermissionClass()::findByName(
$permission,
$guardName ?? $this->getDefaultGuardName()
);
}
if (is_int($permission) || is_string($permission)) {
$permission = $this->getPermissionClass()::findById(
$permission,
$guardName ?? $this->getDefaultGuardName()
);
}

@drbyte drbyte changed the title [v6] fix Role->hasPermissionTo overwrite accorde has permission trait [v6][BC] Fix Role->hasPermissionTo() signature to match HasPermissions trait Mar 30, 2023
@drbyte drbyte merged commit 24de04a into spatie:main Mar 30, 2023
21 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants