Fix code smells in codeclimate

mostafamaklad · Mar 23, 2018 · 4dbe81b · 4dbe81b
1 parent 04f8cf9
commit 4dbe81b
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/src/Traits/HasRoles.php b/src/Traits/HasRoles.php
@@ -165,13 +165,11 @@ public function hasRole($roles): bool
             return $this->roles->contains('name', $roles->name ?? $roles);
         }
 
-        foreach ($roles as $role) {
-            if ($this->hasRole($role)) {
-                return true;
-            }
-        }
+        $roles = \collect()->make($roles)->map(function ($role) {
+            return $role instanceof Role ? $role->name : $role;
+        });
 
-        return false;
+        return ! $roles->intersect($this->roles->pluck('name'))->isEmpty();
     }
 
     /**
@@ -202,6 +200,7 @@ public function hasAllRoles($roles): bool
         if (\is_string($roles) || $roles instanceof Role) {
             return $this->hasRole($roles);
         }
+
         $roles = \collect()->make($roles)->map(function ($role) {
             return $role instanceof Role ? $role->name : $role;
         });