Removed duplication in the attach/detach permission code

santigarcor · Feb 12, 2017 · 7a5db26 · 7a5db26
1 parent b4bf9c5
commit 7a5db26
Showing 1 changed file with 9 additions and 25 deletions.
diff --git a/src/Laratrust/Traits/LaratrustUserTrait.php b/src/Laratrust/Traits/LaratrustUserTrait.php
@@ -345,15 +345,7 @@ public function syncRoles($roles = [])
      */
     public function attachPermission($permission)
     {
-        if (is_object($permission)) {
-            $permission = $permission->getKey();
-        }
-
-        if (is_array($permission)) {
-            $permission = $permission['id'];
-        }
-
-        $this->permissions()->attach($permission);
+        $this->permissions()->attach($this->getIdFor($permission));
         $this->flushCache();
 
         return $this;
@@ -367,15 +359,7 @@ public function attachPermission($permission)
      */
     public function detachPermission($permission)
     {
-        if (is_object($permission)) {
-            $permission = $permission->getKey();
-        }
-
-        if (is_array($permission)) {
-            $permission = $permission['id'];
-        }
-
-        $this->permissions()->detach($permission);
+        $this->permissions()->detach($this->getIdFor($permission));
         $this->flushCache();
 
         return $this;
@@ -465,19 +449,19 @@ public function flushCache()
     }
 
     /**
-     * @param $role
+     * @param $object
      * @return mixed
      */
-    private function getIdFor($role)
+    private function getIdFor($object)
     {
-        if (is_object($role)) {
-            $role = $role->getKey();
+        if (is_object($object)) {
+            $object = $object->getKey();
         }
 
-        if (is_array($role)) {
-            $role = $role['id'];
+        if (is_array($object)) {
+            $object = $object['id'];
         }
 
-        return $role;
+        return $object;
     }
 }