Merge pull request #2320 from spatie/revert-2309-lazy-binding

Revert "fix: Lazily bind dependencies"

Author: drbyte

src/PermissionServiceProvider.php

@@ -13,7 +13,7 @@
 
 class PermissionServiceProvider extends ServiceProvider
 {
-    public function boot()
+    public function boot(PermissionRegistrar $permissionLoader)
     {
         $this->offerPublishing();
 
@@ -23,14 +23,14 @@ public function boot()
 
         $this->registerModelBindings();
 
-        $this->callAfterResolving(PermissionRegistrar::class, function (PermissionRegistrar $permissionLoader) {
-            if ($this->app->config['permission.register_permission_check_method']) {
-                $permissionLoader->clearClassPermissions();
-                $permissionLoader->registerPermissions();
-            }
-        });
+        if ($this->app->config['permission.register_permission_check_method']) {
+            $permissionLoader->clearClassPermissions();
+            $permissionLoader->registerPermissions();
+        }
 
-        $this->app->singleton(PermissionRegistrar::class);
+        $this->app->singleton(PermissionRegistrar::class, function ($app) use ($permissionLoader) {
+            return $permissionLoader;
+        });
     }
 
     public function register()
@@ -74,16 +74,14 @@ protected function registerCommands()
 
     protected function registerModelBindings()
     {
-        $this->app->bind(PermissionContract::class, function ($app) {
-            $config = $app->config['permission.models'];
+        $config = $this->app->config['permission.models'];
 
-            return $app->make($config['permission']);
-        });
-        $this->app->bind(RoleContract::class, function ($app) {
-            $config = $app->config['permission.models'];
+        if (! $config) {
+            return;
+        }
 
-            return $app->make($config['role']);
-        });
+        $this->app->bind(PermissionContract::class, $config['permission']);
+        $this->app->bind(RoleContract::class, $config['role']);
     }
 
     public static function bladeMethodWrapper($method, $role, $guard = null)