ultraware / roles

src/Traits/HasRoleAndPermission.php

Spacing +2 added lines, -2 removed lines

@@ -44,10 +44,10 @@
      */
     public function getRoles()
     {
-        if(!$this->roles){
+        if (!$this->roles) {
             $this->roles = $this->roles()->get();
 
-            foreach($this->roles as $role)
+            foreach ($this->roles as $role)
                     $this->roles = $this->roles->merge($role->descendants());
         }
         return  $this->roles;

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

Spacing +3 added lines, -3 removed lines

@@ -35,7 +35,7 @@ 
      */
     public function parent()
     {
-        return $this->belongsTo(config('roles.models.role'),'parent_id');
+        return $this->belongsTo(config('roles.models.role'), 'parent_id');
     }
 
     public function ancestors()
@@ -56,13 +56,13 @@ 
      */
     public function children()
     {
-        return $this->hasMany(config('roles.models.role'),'parent_id');
+        return $this->hasMany(config('roles.models.role'), 'parent_id');
     }
 
     public function descendants()
     {
         $descendants = $this->where('parent_id', '=', $this->id)->get();
-        foreach($descendants as $descendant)
+        foreach ($descendants as $descendant)
             $descendants = $descendants->merge($descendant->descendants());
         return $descendants;
     }

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;
     }