Finished roles tests

santigarcor · Feb 14, 2017 · 7197458 · 7197458
1 parent 2e4fe7b
commit 7197458
Show file tree

Hide file tree

Showing 3 changed files with 399 additions and 11 deletions.
diff --git a/src/Laratrust/Traits/LaratrustRoleTrait.php b/src/Laratrust/Traits/LaratrustRoleTrait.php
@@ -12,6 +12,7 @@
 
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Cache;
+use InvalidArgumentException;
 
 trait LaratrustRoleTrait
 {
@@ -137,7 +138,7 @@ public function syncPermissions($permissions)
         $changes = $this->permissions()->sync($permissions);
         $this->flushCache();
 
-        return $changes;
+        return $this;
     }
 
     /**
@@ -193,8 +194,12 @@ public function attachPermissions($permissions)
      *
      * @return void
      */
-    public function detachPermissions($permissions)
+    public function detachPermissions($permissions = null)
     {
+        if (!$permissions) {
+            $permissions = $this->permissions()->get();
+        }
+
         foreach ($permissions as $permission) {
             $this->detachPermission($permission);
         }
@@ -218,13 +223,15 @@ public function flushCache()
     private function getIdFor($permission)
     {
         if (is_object($permission)) {
-            $permission = $permission->getKey();
+            return $permission->getKey();
+        } elseif (is_int($permission)) {
+            return $permission;
+        } elseif (is_array($permission)) {
+            return $permission['id'];
         }
 
-        if (is_array($permission)) {
-            $permission = $permission['id'];
-        }
-
-        return $permission;
+        throw new InvalidArgumentException(
+            'getIdFor function only accepts an integer, a Model object or an array with an "id" key'
+        );
     }
 }