Merge pull request #107 from mostafamaklad/v2.0

V2.0.1

Author: mostafamaklad

src/PermissionServiceProvider.php

@@ -2,6 +2,7 @@
 
 namespace Maklad\Permission;
 
+use Illuminate\Contracts\Auth\Access\Gate;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\View\Compilers\BladeCompiler;
 use Maklad\Permission\Contracts\PermissionInterface as Permission;
@@ -14,7 +15,7 @@
  */
 class PermissionServiceProvider extends ServiceProvider
 {
-    public function boot(PermissionRegistrar $permissionLoader)
+    public function boot()
     {
         $helpers = new Helpers();
         if ($helpers->isNotLumen()) {
@@ -40,7 +41,9 @@ public function boot(PermissionRegistrar $permissionLoader)
 
         $this->registerModelBindings();
 
-        $permissionLoader->registerPermissions();
+        $this->app->afterResolving(Gate::class, function () {
+            app(PermissionRegistrar::class)->registerPermissions();
+        });
     }
 
     public function register()

src/Traits/HasPermissions.php

@@ -281,7 +281,7 @@ public function hasAnyPermission(...$permissions): bool
      * @return bool
      * @throws \ReflectionException
      */
-    public function hasAllPermissions(... $permissions): bool
+    public function hasAllPermissions(...$permissions): bool
     {
         $helpers = new Helpers();
         $permissions = $helpers->flattenArray($permissions);

src/Traits/HasRoles.php

@@ -168,7 +168,7 @@ public function hasAnyRole($roles): bool
      *
      * @return bool
      */
-    public function hasAllRoles(... $roles): bool
+    public function hasAllRoles(...$roles): bool
     {
         $helpers = new Helpers();
         $roles = $helpers->flattenArray($roles);