revokePermissionTo, removeRole works with trait collects method

spatie · Nov 13, 2023 · 6549e41 · 6549e41
1 parent b3f23d4
commit 6549e41
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/src/Traits/HasPermissions.php b/src/Traits/HasPermissions.php
@@ -452,10 +452,7 @@ public function syncPermissions(...$permissions)
      */
     public function revokePermissionTo($permission)
     {
-        $this->permissions()->detach(array_map(
-            fn ($item) => $this->getStoredPermission($item)->getKey(),
-            is_a($permission, Collection::class) ? $permission->all() : Arr::wrap($permission)
-        ));
+        $this->permissions()->detach($this->collectPermissions($permission));
 
         if (is_a($this, Role::class)) {
             $this->forgetCachedPermissions();

diff --git a/src/Traits/HasRoles.php b/src/Traits/HasRoles.php
@@ -184,10 +184,7 @@ function ($object) use ($roles, $model, $teamPivot) {
      */
     public function removeRole($role)
     {
-        $this->roles()->detach(array_map(
-            fn ($item) => $this->getStoredRole($item)->getKey(),
-            is_a($role, Collection::class) ? $role->all() : Arr::wrap($role)
-        ));
+        $this->roles()->detach($this->collectRoles($role));
 
         $this->unsetRelation('roles');