Merge pull request #54 from mostafamaklad/v1.7

Fix code smells in code climate
sloan58 · Mar 23, 2018 · a975e4d · a975e4d
2 parents c9b1fb3 + b6d50e5
commit a975e4d
Showing 1 changed file with 10 additions and 24 deletions.
diff --git a/src/Traits/HasRoles.php b/src/Traits/HasRoles.php
@@ -82,7 +82,7 @@ public function scopePermission(Builder $query, $permissions): Builder
         $roles = $roles->unique();
 
         return $query->orWhereIn('permission_ids', $permissions->pluck('_id'))
-                     ->orWhereIn('role_ids', $roles->pluck('_id'));
+            ->orWhereIn('role_ids', $roles->pluck('_id'));
     }
 
     /**
@@ -161,25 +161,15 @@ public function hasRole($roles): bool
             $roles = \explode('|', $roles);
         }
 
-        if (\is_string($roles)) {
-            return $this->roles->contains('name', $roles);
+        if (\is_string($roles) || $roles instanceof Role) {
+            return $this->roles->contains('name', $roles->name ?? $roles);
         }
 
-        if ($roles instanceof Role) {
-            return $this->roles->contains('id', $roles->id);
-        }
-
-        if (\is_array($roles)) {
-            foreach ($roles as $role) {
-                if ($this->hasRole($role)) {
-                    return true;
-                }
-            }
-
-            return false;
-        }
+        $roles = \collect()->make($roles)->map(function ($role) {
+            return $role instanceof Role ? $role->name : $role;
+        });
 
-        return ! $roles->intersect($this->roles)->isEmpty();
+        return ! $roles->intersect($this->roles->pluck('name'))->isEmpty();
     }
 
     /**
@@ -207,12 +197,8 @@ public function hasAllRoles($roles): bool
             $roles = \explode('|', $roles);
         }
 
-        if (\is_string($roles)) {
-            return $this->roles->contains('name', $roles);
-        }
-
-        if ($roles instanceof Role) {
-            return $this->roles->contains('id', $roles->id);
+        if (\is_string($roles) || $roles instanceof Role) {
+            return $this->hasRole($roles);
         }
 
         $roles = \collect()->make($roles)->map(function ($role) {
@@ -375,7 +361,7 @@ private function convertToRoleModels($roles): Collection
             $roles = collect($roles);
         }
 
-        if (! $roles instanceof Collection) {
+        if (!$roles instanceof Collection) {
             $roles = collect([$roles]);
         }