From 59bed27e0b597056e30d89b9c911c1d380d3d2d8 Mon Sep 17 00:00:00 2001 From: Mostafa Maklad Date: Sun, 18 Mar 2018 01:43:54 +0300 Subject: [PATCH] fix code smells for codeclimate --- src/Traits/HasRoles.php | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/Traits/HasRoles.php b/src/Traits/HasRoles.php index f178740..801987b 100644 --- a/src/Traits/HasRoles.php +++ b/src/Traits/HasRoles.php @@ -164,20 +164,16 @@ public function hasRole($roles, bool $strict = false): bool } if (\is_array($roles) || $roles instanceof Collection) { - $roles = \collect()->make($roles)->map(function ($role) { + $roles = \collect($roles)->map(function ($role) { return $role instanceof Role ? $role->name : $role; }); if ($strict) { - $hasRoles = $roles->intersect($this->roles->pluck('name')) == $roles; - } else { - $hasRoles = ! $roles->intersect($this->roles->pluck('name'))->isEmpty(); + return $roles->intersect($this->roles->pluck('name'))->count() === $roles->count(); } - } else { - $hasRoles = $this->roles->contains('name', $roles->name?? $roles); + return ! $roles->intersect($this->roles->pluck('name'))->isEmpty(); } - - return $hasRoles; + return $this->roles->contains('name', $roles->name?? $roles); } /**