flush

[pharext/pharext.org] / app / bootstrap / config.php

diff --git a/app/bootstrap/config.php b/app/bootstrap/config.php
index cbf70d2d80bc843353af6b0b9be05585c6af6671..3bc7f910667144c4c91f37c9d140cc57e5d05376 100644 (file)
--- a/app/bootstrap/config.php
+++ b/app/bootstrap/config.php
@@ -2,25 +2,16 @@
 
 namespace app;
 
-use merry\Config;
-
 define("APP_ENVIRONMENT", getenv("APP_ENVIRONMENT") ?: "localhost");
 
 $injector->share(Config::class)
        ->define(Config::class, [
-               ":array" => parse_ini_file(__DIR__."/../config.ini", true),
+               "+array" => function($key, $injector) {
+                       return parse_ini_file(__DIR__."/../../config/app.ini", true);
+               },
                ":section" => APP_ENVIRONMENT
        ])
-       ->prepare(Config::class, function(Config $config) {
-               $credentials = parse_ini_file(__DIR__."/../credentials.ini", true);
-               foreach (new Config($credentials, APP_ENVIRONMENT) as $app => $creds) {
-                       /* one level down should suffice, i.e. $config->github->client = {id,secret,scope} */
-                       if ($creds instanceof Config) {
-                               foreach ($creds as $key => $val) {
-                                       $config->$app->$key = $val;
-                               }
-                       } else {
-                               $config->$app = $creds;
-                       }
-               }
+       ->prepare(Config::class, function($config, $injector) {
+               $credentials = parse_ini_file(__DIR__."/../../config/credentials.ini", true);
+               $config->addConfig(new Config($credentials, APP_ENVIRONMENT));
        });