diff --git a/src/Traits/HasRoles.php b/src/Traits/HasRoles.php index 93cc089..7443e04 100644 --- a/src/Traits/HasRoles.php +++ b/src/Traits/HasRoles.php @@ -160,23 +160,23 @@ public function hasRole($roles): bool if (\is_string($roles) && false !== \strpos($roles, '|')) { $roles = \explode('|', $roles); } - $has_role = false; + $hasRole = false; if (\is_string($roles)) { - $has_role = $this->roles->contains('name', $roles); + $hasRole = $this->roles->contains('name', $roles); } elseif ($roles instanceof Role) { - $has_role = $this->roles->contains('id', $roles->id); + $hasRole = $this->roles->contains('id', $roles->id); } elseif (\is_array($roles)) { foreach ($roles as $role) { if ($this->hasRole($role)) { - $has_role = true; + $hasRole = true; break; } } } else { - $has_role = ! $roles->intersect($this->roles)->isEmpty(); + $hasRole = ! $roles->intersect($this->roles)->isEmpty(); } - return $has_role; + return $hasRole; } /** @@ -205,17 +205,17 @@ public function hasAllRoles($roles): bool } if (\is_string($roles)) { - $has_roles = $this->roles->contains('name', $roles); + $hasRoles = $this->roles->contains('name', $roles); } elseif ($roles instanceof Role) { - $has_roles = $this->roles->contains('id', $roles->id); + $hasRoles = $this->roles->contains('id', $roles->id); } else { $roles = \collect()->make($roles)->map(function ($role) { return $role instanceof Role ? $role->name : $role; }); - $has_roles = $roles->intersect($this->roles->pluck('name')) == $roles; + $hasRoles = $roles->intersect($this->roles->pluck('name')) == $roles; } - return $has_roles; + return $hasRoles; } /**