ultraware / roles

src/Traits/HasRoleAndPermission.php

Doc Comments +2 added lines, -2 removed lines

@@ -50,7 +50,7 @@ 
     /**
      * Check if the user has a role or roles.
      *
-     * @param int|string|array $role
+     * @param string $role
      * @param bool $all
      * @return bool
      */
@@ -218,7 +218,7 @@ 
     /**
      * Check if the user has a permission or permissions.
      *
-     * @param int|string|array $permission
+     * @param string $permission
      * @param bool $all
      * @return bool
      */

Braces +3 added lines, -2 removed lines

@@ -47,8 +47,9 @@
         if(!$this->roles){
             $this->roles = $this->roles()->get();
 
-            foreach($this->roles as $role)
-                    $this->roles = $this->roles->merge($role->descendants());
+            foreach($this->roles as $role) {
+                                $this->roles = $this->roles->merge($role->descendants());
+            }
         }
         return  $this->roles;
     }

src/Traits/RoleHasRelations.php

Braces +3 added lines, -2 removed lines

@@ -62,8 +62,9 @@
     public function descendants()
     {
         $descendants = $this->where('parent_id', '=', $this->id)->get();
-        foreach($descendants as $descendant)
-            $descendants = $descendants->merge($descendant->descendants());
+        foreach($descendants as $descendant) {
+                    $descendants = $descendants->merge($descendant->descendants());
+        }
         return $descendants;
     }