Refactoring loader

Author: papac

src/Configuration/EnvConfiguration.php

@@ -14,6 +14,7 @@ class EnvConfiguration extends Configuration
     public function create(Loader $config): void
     {
         Env::configure(base_path('.env.json'));
+
         $event = Env::getInstance();
 
         $this->container->instance('env', $event);

src/Configuration/Loader.php

@@ -10,8 +10,8 @@
 use Bow\Support\Arraydotify;
 use Bow\Session\SessionConfiguration;
 use Bow\Configuration\EnvConfiguration;
-use Bow\Container\ContainerConfiguration;
 use Bow\Application\Exception\ApplicationException;
+use Bow\Container\CompassConfiguration;
 
 class Loader implements ArrayAccess
 {
@@ -175,32 +175,20 @@ public function boot(): Loader
             return $this;
         }
 
-        $services = array_merge(
-            [ContainerConfiguration::class, EnvConfiguration::class],
-            $this->configurations(),
-        );
-
-        $service_collection = [];
+        $services = array_merge([CompassConfiguration::class], $this->configurations());
 
         $container = Capsule::getInstance();
 
+        $this->loadConfiguration(EnvConfiguration::class, $container);
+
         // Configuration of services
         foreach ($services as $service) {
             if ($this->without_session && $service === SessionConfiguration::class) {
                 continue;
             }
 
-            if (!class_exists($service)) {
-                continue;
-            }
-
-            $service_instance = new $service($container);
-            $service_instance->create($this);
-            $service_collection[] = $service_instance;
-
-            // Encure that the .env file is loaded before others services
-            if ($service === EnvConfiguration::class) {
-                $this->loadEnvfile();
+            if (class_exists($service)) {
+                $service_collection[] = $this->loadConfiguration($service, $container);
             }
         }
 
@@ -213,7 +201,7 @@ public function boot(): Loader
         foreach ($this->events() as $name => $handlers) {
             $handlers = (array) $handlers;
             foreach ($handlers as $handler) {
-                Event::on($name, $handler);
+                app_event($name, $handler);
             }
         }
 
@@ -223,6 +211,22 @@ public function boot(): Loader
         return $this;
     }
 
+    /**
+     * Load a configuration service
+     *
+     * @param  string $service
+     * @param  Capsule $container
+     * @return Configuration
+     */
+    private function loadConfiguration(string $service, Capsule $container): Configuration
+    {
+        $service_instance = new $service($container);
+
+        $service_instance->create($this);
+
+        return $service_instance;
+    }
+
     /**
      * Load the .env file
      *

src/Container/ContainerConfiguration.php src/Container/CompassConfiguration.phpsrc/Container/ContainerConfiguration.php renamed to src/Container/CompassConfiguration.php

@@ -7,7 +7,7 @@
 use Bow\Configuration\Configuration;
 use Bow\Configuration\Loader;
 
-class ContainerConfiguration extends Configuration
+class CompassConfiguration extends Configuration
 {
     /**
      * @var array
@@ -21,7 +21,7 @@ class ContainerConfiguration extends Configuration
      */
     public function create(Loader $config): void
     {
-        $this->container->bind('container', function () use ($config) {
+        $this->container->bind('compass', function () use ($config) {
             $middlewares = array_merge($config->getMiddlewares(), $this->middlewares);
 
             return Compass::configure($config->namespaces(), $middlewares);
@@ -33,6 +33,6 @@ public function create(Loader $config): void
      */
     public function run(): void
     {
-        $this->container->make('action');
+        $this->container->make('compass');
     }
 }