refactor

spatie · Jul 23, 2016 · b817bae · b817bae
1 parent 5eca21c
commit b817bae
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 28 deletions.
diff --git a/src/Traits/HasPermissions.php b/src/Traits/HasPermissions.php
@@ -15,15 +15,14 @@ trait HasPermissions
      */
     public function givePermissionTo(...$permissions)
     {
-        collect($permissions)
+        $permissions = collect($permissions)
             ->flatten()
             ->map(function ($permission) {
                 return $this->getStoredPermission($permission);
-            })
-            ->each(function (Permission $permission) {
-                return $this->permissions()->save($permission);
             });
 
+        $this->permissions()->saveMany($permissions);
+
         $this->forgetCachedPermissions();
 
         return $this;
@@ -40,17 +39,7 @@ public function syncPermissions(...$permissions)
     {
         $this->permissions()->detach();
 
-        collect($permissions)
-            ->flatten()
-            ->map(function ($permission) {
-                return $this->getStoredPermission($permission);
-            })->each(function (Permission $permission) {
-                $this->permissions()->save($permission);
-            });
-
-        $this->forgetCachedPermissions();
-
-        return $this;
+        return $this->givePermissionTo($permissions);
     }
 
     /**

diff --git a/src/Traits/HasRoles.php b/src/Traits/HasRoles.php
@@ -45,15 +45,14 @@ public function permissions()
      */
     public function assignRole(...$roles)
     {
-        collect($roles)
+        $roles = collect($roles)
             ->flatten()
             ->map(function ($role) {
                 return $this->getStoredRole($role);
-            })
-            ->each(function (Role $role) {
-                return $this->roles()->save($role);
             });
 
+        $this->roles()->saveMany($roles);
+
         $this->forgetCachedPermissions();
 
         return $this;
@@ -80,15 +79,7 @@ public function syncRoles(...$roles)
     {
         $this->roles()->detach();
 
-        collect($roles)
-            ->flatten()
-            ->map(function ($role) {
-                return $this->getStoredRole($role);
-            })->each(function (Role $role) {
-                $this->roles()->save($role);
-            });
-
-        return $this;
+        return $this->assignRole($roles);
     }
 
     /**