Skip to content

Commit

Permalink
update variable naming
Browse files Browse the repository at this point in the history
  • Loading branch information
mostafamaklad committed Mar 17, 2018
1 parent ec07e57 commit bc76fe8
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions src/Traits/HasRoles.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

/**
Expand Down Expand Up @@ -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;
}

/**
Expand Down

0 comments on commit bc76fe8

Please sign in to comment.