Add wildcard check for hasRole and hasPermission methods

Famdirksen · Jun 16, 2015 · b2b09c6 · b2b09c6
1 parent febb1ed
commit b2b09c6
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/Bican/Roles/Traits/HasRoleAndPermission.php b/src/Bican/Roles/Traits/HasRoleAndPermission.php
@@ -93,7 +93,9 @@ protected function isAll(array $roles)
      */
     protected function hasRole($role)
     {
-        return $this->getRoles()->contains($role) || $this->getRoles()->contains('slug', $role);
+        return $this->getRoles()->contains(function ($key, $value) use ($role) {
+            return $role == $value->id || str_is($role, $value->slug);
+        });
     }
 
     /**
@@ -225,7 +227,9 @@ protected function canAll(array $permissions)
      */
     protected function hasPermission($permission)
     {
-        return $this->getPermissions()->contains($permission) || $this->getPermissions()->contains('slug', $permission);
+        return $this->getPermissions()->contains(function ($key, $value) use ($permission) {
+            return $permission == $value->id || str_is($permission, $value->slug);
+        });
     }
 
     /**