blax-software
/
laravel-roles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

I syncRoles & hasRole

This commit is contained in:
a6a2f5842 2025-06-19 11:34:12 +02:00
parent 20162a4931
commit 79e5c832db
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Traits/HasRoles.php
View File

@ -35,7 +35,6 @@ trait HasRoles
} elseif (is_numeric($role)) { } elseif (is_numeric($role)) {
$role = config('roles.models.role', \Blax\Roles\Models\Role::class)::find($role); $role = config('roles.models.role', \Blax\Roles\Models\Role::class)::find($role);
} elseif ($role instanceof Role) { } elseif ($role instanceof Role) {
// use pivot column to avoid ambiguous `id`
return $this->roles()->wherePivot('role_id', $role->id)->exists(); return $this->roles()->wherePivot('role_id', $role->id)->exists();
} else { } else {
throw new \InvalidArgumentException('Role must be a string, numeric ID, or an instance of Role.'); throw new \InvalidArgumentException('Role must be a string, numeric ID, or an instance of Role.');
@ -107,9 +106,15 @@ trait HasRoles
$roleModel = config('roles.models.role', \Blax\Roles\Models\Role::class)::find($role); $roleModel = config('roles.models.role', \Blax\Roles\Models\Role::class)::find($role);
} elseif ($role instanceof Role) { } elseif ($role instanceof Role) {
$roleModel = $role; $roleModel = $role;
} elseif (is_object($role) && isset($role->id)) {
$roleModel = config('roles.models.role', \Blax\Roles\Models\Role::class)::find($role->id);
} elseif (is_array($role) && isset($role['id'])) {
$roleModel = config('roles.models.role', \Blax\Roles\Models\Role::class)::find($role['id']);
} else {
throw new \InvalidArgumentException('Role must be a string, numeric ID, or an instance of Role.');
} }
if ($roleModel instanceof Role) { if (@$roleModel instanceof Role) {
$roleIds[] = $roleModel->id; $roleIds[] = $roleModel->id;
} }
} }
@ -135,6 +140,7 @@ trait HasRoles
} }
return false; return false;
} }
/** /**
* Checks if the memberable has all of the given roles * Checks if the memberable has all of the given roles
* *