fix for testing non existing permissions

spatie · Jan 10, 2016 · 6c2421c · 6c2421c
1 parent cb6ac82
commit 6c2421c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All Notable changes to `laravel-permission` will be documented in this file
 
+## 1.3.1 - 2016-01-10
+
+- fixed bug when testing for non existing permissions
+
 ## 1.3.0 - 2015-12-25
 
 - added compatiblity for Laravel 5.2

diff --git a/src/Traits/HasRoles.php b/src/Traits/HasRoles.php
@@ -77,7 +77,7 @@ public function hasRole($roles)
             return $this->roles->contains('id', $roles->id);
         }
 
-        return (bool) !!$roles->intersect($this->roles)->count();
+        return (bool) (bool) $roles->intersect($this->roles)->count();
     }
 
     /**
@@ -169,6 +169,10 @@ protected function hasDirectPermission(Permission $permission)
     {
         if (is_string($permission)) {
             $permission = app(Permission::class)->findByName($permission);
+
+            if (!$permission) {
+                return false;
+            }
         }
 
         return $this->permissions->contains('id', $permission->id);