Improved entire Bootstrap logic.

README.md

@@ -33,7 +33,7 @@ Besides parameters for supporting services, for example database connection, cac
 
 Ultimately, goal is to load/aggregate configurations based on the environment, and make it available for the application typically in form of an array or an ArrayObject.
 
-While Phoundation is quite flexible in this regard thanks to `Phoundation\Config\Loader\LoaderInterface`, there's a trend adopted by many frameworks and projects for environment-specific configurations, a concept that is nicely described in [Zend Framework's documentation](https://docs.zendframework.com/tutorials/advanced-config/#environment-specific-application-configuration).
+While Phoundation is quite flexible in this regard thanks to `Phoundation\Config\Loader\ConfigLoaderInterface`, there's a trend adopted by many frameworks and projects for environment-specific configurations, a concept that is nicely described in [Zend Framework's documentation](https://docs.zendframework.com/tutorials/advanced-config/#environment-specific-application-configuration).
 
 ### Dependency Injection
 
@@ -59,17 +59,13 @@ Component that connects these different pieces together is `Bootstrap` which is
 
 ```php
 use Phoundation\Bootstrap\Bootstrap;
+use Phoundation\Config\Loader\FileLoader;
 use Phoundation\Di\Container\Factory\ZendServiceManagerFactory;
 
-$bootstrap = new Bootstrap([
-    'config' => [
-        'foo' => 'bar',
-    ],
-    'config_glob_paths' => [
-        sprintf('config/{{,*.}global,{,*.}%s}.php', getenv('APP_ENV') ?: 'local'),
-    ],
-    'di_container_factory' => ZendServiceManagerFactory::class,
-]);
+$bootstrap = new Bootstrap(
+    new FileLoader(glob(sprintf('config/{{,*.}global,{,*.}%s}.php', getenv('APP_ENV') ?: 'local'), GLOB_BRACE)),
+    new ZendServiceManagerFactory()
+);
 $diContainer = $bootstrap();
 
 //...

src/Bootstrap/Bootstrap.php

@@ -12,9 +12,10 @@
 
 namespace Phoundation\Bootstrap;
 
+use Phoundation\Config\Loader\ConfigLoaderInterface;
+use Phoundation\Di\Container\Factory\DiContainerFactoryInterface;
 use Phoundation\Config\Config;
 use Psr\Container\ContainerInterface;
-use Phoundation\Config\ConfigFactory;
 use Phoundation\ErrorHandling\RunnerInterface;
 
 /**
@@ -23,9 +24,14 @@
 class Bootstrap
 {
     /**
-     * @var Options
+     * @var ConfigLoaderInterface
      */
-    protected $options;
+    protected $configLoader;
+
+    /**
+     * @var DiContainerFactoryInterface
+     */
+    protected $diContainerFactory;
 
     /**
      * @var Config
@@ -37,14 +43,15 @@ class Bootstrap
      */
     protected $diContainer;
 
-    public function __construct(array $options)
+    public function __construct(ConfigLoaderInterface $configLoader, DiContainerFactoryInterface $diContainerFactory)
     {
-        $this->options = Options::fromArray($options);
+        $this->configLoader = $configLoader;
+        $this->diContainerFactory = $diContainerFactory;
     }
 
     public function __invoke()
     {
-        $this->buildConfig();
+        $this->loadConfig();
         $this->buildDiContainer();
 
         $this->setPhpSettings();
@@ -53,26 +60,17 @@ public function __invoke()
         return $this->diContainer;
     }
 
-    protected function buildConfig()
+    protected function loadConfig()
     {
-        $config = Config::fromArray($this->options->getConfig());
-
-        foreach ($this->options->getConfigPaths() as $path) {
-            $config->merge(ConfigFactory::createFromPath($path));
-        }
-
-        foreach ($this->options->getConfigGlobPaths() as $globPath) {
-            $config->merge(ConfigFactory::createFromGlobPath($globPath));
-        }
-
-        $this->config = $config;
+        $configLoader = $this->configLoader;
+        $this->config = $configLoader();
     }
 
     protected function buildDiContainer()
     {
-        $diContainerFactory = $this->options->getDiContainerFactory();
+        $diContainerFactory = $this->diContainerFactory;
 
-        $this->diContainer = $diContainerFactory($this->config, $this->options->getDiConfigKey(), $this->options->getConfigServiceName());
+        $this->diContainer = $diContainerFactory($this->config);
     }
 
     protected function setPhpSettings()

src/Config/Config.php

@@ -23,30 +23,4 @@ public static function fromArray(array $config)
     {
         return new self($config);
     }
-
-    public function merge(Config $config)
-    {
-        $mergedConfig = self::arrayMerge($this->getArrayCopy(), $config->getArrayCopy());
-
-        $this->exchangeArray($mergedConfig);
-    }
-
-    final protected static function arrayMerge(array $a, array $b) : array
-    {
-        foreach ($b as $key => $value) {
-            if (array_key_exists($key, $a)) {
-                if (is_int($key)) {
-                    $a[] = $value;
-                } elseif (is_array($value) && is_array($a[$key])) {
-                    $a[$key] = self::arrayMerge($a[$key], $value);
-                } else {
-                    $a[$key] = $value;
-                }
-            } else {
-                $a[$key] = $value;
-            }
-        }
-
-        return $a;
-    }
 }

src/Config/Loader/AbstractLoader.php

@@ -0,0 +1,38 @@
+<?php
+/**
+ * This file is part of the Phoundation package.
+ *
+ * Copyright (c) Nikola Posa
+ *
+ * For full copyright and license information, please refer to the LICENSE file,
+ * located at the package root folder.
+ */
+
+declare(strict_types=1);
+
+namespace Phoundation\Config\Loader;
+
+/**
+ * @author Nikola Posa <[email protected]>
+ */
+abstract class AbstractLoader implements ConfigLoaderInterface
+{
+    final protected static function arrayMerge(array $a, array $b) : array
+    {
+        foreach ($b as $key => $value) {
+            if (array_key_exists($key, $a)) {
+                if (is_int($key)) {
+                    $a[] = $value;
+                } elseif (is_array($value) && is_array($a[$key])) {
+                    $a[$key] = self::arrayMerge($a[$key], $value);
+                } else {
+                    $a[$key] = $value;
+                }
+            } else {
+                $a[$key] = $value;
+            }
+        }
+
+        return $a;
+    }
+}

src/Config/Loader/CachingLoader.php

@@ -0,0 +1,20 @@
+<?php
+/**
+ * This file is part of the Phoundation package.
+ *
+ * Copyright (c) Nikola Posa
+ *
+ * For full copyright and license information, please refer to the LICENSE file,
+ * located at the package root folder.
+ */
+
+declare(strict_types=1);
+
+namespace Phoundation\Config\Loader;
+
+/**
+ * @author Nikola Posa <[email protected]>
+ */
+class CachingLoader
+{
+}

src/Config/Loader/ConfigLoaderInterface.php

@@ -0,0 +1,23 @@
+<?php
+/**
+ * This file is part of the Phoundation package.
+ *
+ * Copyright (c) Nikola Posa
+ *
+ * For full copyright and license information, please refer to the LICENSE file,
+ * located at the package root folder.
+ */
+
+declare(strict_types=1);
+
+namespace Phoundation\Config\Loader;
+
+use Phoundation\Config\Config;
+
+/**
+ * @author Nikola Posa <[email protected]>
+ */
+interface ConfigLoaderInterface
+{
+    public function __invoke() : Config;
+}