Remove multiple roles

mostafamaklad · Jan 25, 2018 · 2b625e0 · 2b625e0
1 parent d75a0c5
commit 2b625e0
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/src/Traits/HasRoles.php b/src/Traits/HasRoles.php
@@ -113,11 +113,23 @@ public function assignRole(...$roles)
     /**
      * Revoke the given role from the model.
      *
-     * @param string|Role $role
+     * @param array|string|Role ...$roles
+     *
+     * @return HasRoles
      */
-    public function removeRole($role)
+    public function removeRole(...$roles)
     {
-        $this->roles()->detach($this->getStoredRole($role));
+        \collect($roles)
+            ->flatten()
+            ->map(function ($role) {
+                $role = $this->getStoredRole($role);
+                $this->roles()->detach($this->getStoredRole($role));
+                return $role;
+            });
+
+        $this->forgetCachedPermissions();
+
+        return $this;
     }
 
     /**

diff --git a/tests/HasRolesTest.php b/tests/HasRolesTest.php
@@ -495,4 +495,17 @@ public function it_does_not_detach_roles_when_soft_deleting()
         $user = SoftDeletingUser::withTrashed()->find($user->id);
         $this->assertTrue($user->hasRole('testRole'));
     }
+
+    /** @test */
+    public function it_can_give_and_revoke_multiple_roles()
+    {
+        $this->testUser->assignRole('testRole');
+        $this->testUser->assignRole('testRole2');
+
+        $this->testUser->removeRole('testRole', 'testRole2');
+
+        $this->assertFalse($this->testUser->hasRole('testRole'));
+
+        $this->assertFalse($this->testUser->hasRole('testRole2'));
+    }
 }