Isolate the autoload run invokation.

lunarstorm · Nov 16, 2024 · b8fa04c · b8fa04c
1 parent 9ab8b6f
commit b8fa04c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/LaravelDDDServiceProvider.php b/src/LaravelDDDServiceProvider.php
@@ -119,15 +119,17 @@ protected function registerMigrations()
 
     public function packageBooted()
     {
+        Autoload::boot();
+
+        Autoload::run();
+
         if ($this->app->runningInConsole() && method_exists($this, 'optimizes')) {
             $this->optimizes(
                 optimize: 'ddd:optimize',
                 clear: 'ddd:clear',
                 key: 'laravel-ddd',
             );
         }
-
-        Autoload::boot();
     }
 
     public function packageRegistered()

diff --git a/src/Support/AutoloadManager.php b/src/Support/AutoloadManager.php
@@ -56,8 +56,7 @@ public function boot()
             ->when(config('ddd.autoload.providers') === true, fn () => $this->handleProviders())
             ->when(app()->runningInConsole() && config('ddd.autoload.commands') === true, fn () => $this->handleCommands())
             ->when(config('ddd.autoload.policies') === true, fn () => $this->handlePolicies())
-            ->when(config('ddd.autoload.factories') === true, fn () => $this->handleFactories())
-            ->run();
+            ->when(config('ddd.autoload.factories') === true, fn () => $this->handleFactories());
 
         $this->booted = true;
     }
@@ -152,7 +151,7 @@ protected function handleCommands()
         return $this;
     }
 
-    protected function run()
+    public function run()
     {
         if ($this->hasRun()) {
             return $this;