@@ -44,10 +44,10 @@ |
||
44 | 44 | */ |
45 | 45 | public function getRoles() |
46 | 46 | { |
47 | - if(!$this->roles){ |
|
47 | + if (!$this->roles) { |
|
48 | 48 | $this->roles = $this->roles()->get(); |
49 | 49 | |
50 | - foreach($this->roles as $role) |
|
50 | + foreach ($this->roles as $role) |
|
51 | 51 | $this->roles = $this->roles->merge($role->descendants()); |
52 | 52 | } |
53 | 53 | return $this->roles; |
@@ -47,8 +47,9 @@ |
||
47 | 47 | if(!$this->roles){ |
48 | 48 | $this->roles = $this->roles()->get(); |
49 | 49 | |
50 | - foreach($this->roles as $role) |
|
51 | - $this->roles = $this->roles->merge($role->descendants()); |
|
50 | + foreach($this->roles as $role) { |
|
51 | + $this->roles = $this->roles->merge($role->descendants()); |
|
52 | + } |
|
52 | 53 | } |
53 | 54 | return $this->roles; |
54 | 55 | } |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | */ |
36 | 36 | public function parent() |
37 | 37 | { |
38 | - return $this->belongsTo(config('roles.models.role'),'parent_id'); |
|
38 | + return $this->belongsTo(config('roles.models.role'), 'parent_id'); |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | public function ancestors() |
@@ -56,13 +56,13 @@ discard block |
||
56 | 56 | */ |
57 | 57 | public function children() |
58 | 58 | { |
59 | - return $this->hasMany(config('roles.models.role'),'parent_id'); |
|
59 | + return $this->hasMany(config('roles.models.role'), 'parent_id'); |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | public function descendants() |
63 | 63 | { |
64 | 64 | $descendants = $this->where('parent_id', '=', $this->id)->get(); |
65 | - foreach($descendants as $descendant) |
|
65 | + foreach ($descendants as $descendant) |
|
66 | 66 | $descendants = $descendants->merge($descendant->descendants()); |
67 | 67 | return $descendants; |
68 | 68 | } |
@@ -62,8 +62,9 @@ |
||
62 | 62 | public function descendants() |
63 | 63 | { |
64 | 64 | $descendants = $this->where('parent_id', '=', $this->id)->get(); |
65 | - foreach($descendants as $descendant) |
|
66 | - $descendants = $descendants->merge($descendant->descendants()); |
|
65 | + foreach($descendants as $descendant) { |
|
66 | + $descendants = $descendants->merge($descendant->descendants()); |
|
67 | + } |
|
67 | 68 | return $descendants; |
68 | 69 | } |
69 | 70 |