Fix installers

anomalylabs · Feb 15, 2021 · 4adb3c8 · 4adb3c8
1 parent c71778c
commit 4adb3c8
Showing 1 changed file with 19 additions and 18 deletions.
diff --git a/src/Installer/Command/GetInstallers.php b/src/Installer/Command/GetInstallers.php
@@ -1,18 +1,20 @@
-<?php namespace Anomaly\InstallerModule\Installer\Command;
+<?php
 
+namespace Anomaly\InstallerModule\Installer\Command;
+
+use Anomaly\Streams\Platform\Console\Kernel;
+use Anomaly\Streams\Platform\Installer\Installer;
+use Anomaly\Streams\Platform\Installer\InstallerCollection;
 use Anomaly\Streams\Platform\Application\ApplicationRepository;
+use Anomaly\Streams\Platform\Entry\Command\AutoloadEntryModels;
 use Anomaly\Streams\Platform\Application\Command\ReloadEnvironmentFile;
-use Anomaly\Streams\Platform\Console\Kernel;
-use Anomaly\Streams\Platform\Installer\Console\Command\LoadApplicationInstallers;
+use Anomaly\Streams\Platform\Installer\Console\Command\LoadModuleSeeders;
 use Anomaly\Streams\Platform\Installer\Console\Command\LoadBaseMigrations;
 use Anomaly\Streams\Platform\Installer\Console\Command\LoadCoreInstallers;
-use Anomaly\Streams\Platform\Installer\Console\Command\LoadExtensionInstallers;
 use Anomaly\Streams\Platform\Installer\Console\Command\LoadExtensionSeeders;
 use Anomaly\Streams\Platform\Installer\Console\Command\LoadModuleInstallers;
-use Anomaly\Streams\Platform\Installer\Console\Command\LoadModuleSeeders;
-use Anomaly\Streams\Platform\Installer\Installer;
-use Anomaly\Streams\Platform\Installer\InstallerCollection;
-use Illuminate\Foundation\Bus\DispatchesJobs;
+use Anomaly\Streams\Platform\Installer\Console\Command\LoadExtensionInstallers;
+use Anomaly\Streams\Platform\Installer\Console\Command\LoadApplicationInstallers;
 
 /**
  * Class GetInstallers
@@ -24,8 +26,6 @@
 class GetInstallers
 {
 
-    use DispatchesJobs;
-
     /**
      * Handle the command.
      *
@@ -35,11 +35,11 @@ public function handle()
     {
         $installers = new InstallerCollection();
 
-        $this->dispatch(new LoadCoreInstallers($installers));
-        $this->dispatch(new LoadApplicationInstallers($installers));
+        dispatch_now(new LoadCoreInstallers($installers));
+        dispatch_now(new LoadApplicationInstallers($installers));
 
-        $this->dispatch(new LoadModuleInstallers($installers));
-        $this->dispatch(new LoadExtensionInstallers($installers));
+        dispatch_now(new LoadModuleInstallers($installers));
+        dispatch_now(new LoadExtensionInstallers($installers));
 
         $installers->push(
             new Installer(
@@ -48,14 +48,15 @@ function (Kernel $console) {
 
                     $console->call('env:set', ['line' => 'INSTALLED=true']);
 
-                    $this->dispatch(new ReloadEnvironmentFile());
+                    dispatch_now(new ReloadEnvironmentFile());
+                    dispatch_now(new AutoloadEntryModels());
                 }
             )
         );
 
-        $this->dispatch(new LoadBaseMigrations($installers));
-        $this->dispatch(new LoadModuleSeeders($installers));
-        $this->dispatch(new LoadExtensionSeeders($installers));
+        dispatch_now(new LoadBaseMigrations($installers));
+        dispatch_now(new LoadModuleSeeders($installers));
+        dispatch_now(new LoadExtensionSeeders($installers));
 
         $installers->push(
             new Installer(