Merge pull request #2248 from mtawil/patch-1

Don't throw an exception when checking hasAllPermissions()
spatie · Nov 19, 2022 · 76dd153 · 76dd153
2 parents ddaeda1 + a1e4463
commit 76dd153
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/Traits/HasPermissions.php b/src/Traits/HasPermissions.php
@@ -249,14 +249,13 @@ public function hasAnyPermission(...$permissions): bool
      * @param string|int|array|\Spatie\Permission\Contracts\Permission|\Illuminate\Support\Collection ...$permissions
      *
      * @return bool
-     * @throws \Exception
      */
     public function hasAllPermissions(...$permissions): bool
     {
         $permissions = collect($permissions)->flatten();
 
         foreach ($permissions as $permission) {
-            if (! $this->hasPermissionTo($permission)) {
+            if (! $this->checkPermissionTo($permission)) {
                 return false;
             }
         }
@@ -486,6 +485,7 @@ public function forgetCachedPermissions()
 
     /**
      * Check if the model has All of the requested Direct permissions.
+     *
      * @param string|int|array|\Spatie\Permission\Contracts\Permission|\Illuminate\Support\Collection ...$permissions
      * @return bool
      */
@@ -504,6 +504,7 @@ public function hasAllDirectPermissions(...$permissions): bool
 
     /**
      * Check if the model has Any of the requested Direct permissions.
+     *
      * @param string|int|array|\Spatie\Permission\Contracts\Permission|\Illuminate\Support\Collection ...$permissions
      * @return bool
      */