Merge branch 'master' of https://github.com/prooph/proophessor-do

prooph · Apr 22, 2016 · 7ae3cd1 · 7ae3cd1
2 parents 6b25d45 + f7f1580
commit 7ae3cd1
Showing 1 changed file with 20 additions and 20 deletions.
diff --git a/config/config.php b/config/config.php
@@ -14,27 +14,27 @@
 
 $cachedConfigFile = 'data/cache/app_config.php';
 
-$config = [];
 if (is_file($cachedConfigFile)) {
-    // Try to load the cached config
-    $config = include $cachedConfigFile;
-} else {
-    // Load configuration from autoload path
-    foreach (Glob::glob('config/autoload/{{,*.}global,{,*.}local}.php', Glob::GLOB_BRACE) as $file) {
-        $config = ArrayUtils::merge($config, include $file);
-    }
-
-    $mongoClientFactoryConfigFile = 'config/autoload/mongo_client.local.php';
-
-    if (file_exists($mongoClientFactoryConfigFile)) {
-        $mongoClientFactoryConfig = include $mongoClientFactoryConfigFile;
-        $config['dependencies']['factories']['mongo_client'] = $mongoClientFactoryConfig['mongo_client'];
-    }
-
-    // Cache config if enabled
-    if (isset($config['config_cache_enabled']) && $config['config_cache_enabled'] === true) {
-        file_put_contents($cachedConfigFile, '<?php return ' . var_export($config, true) . ';');
-    }
+    return new ArrayObject($cachedConfigFile, ArrayObject::ARRAY_AS_PROPS);
+}
+
+$config = [];
+
+// Load configuration from autoload path
+foreach (Glob::glob('config/autoload/{{,*.}global,{,*.}local}.php', Glob::GLOB_BRACE) as $file) {
+    $config = ArrayUtils::merge($config, include $file);
+}
+
+$mongoClientFactoryConfigFile = 'config/autoload/mongo_client.local.php';
+
+if (file_exists($mongoClientFactoryConfigFile)) {
+    $mongoClientFactoryConfig = include $mongoClientFactoryConfigFile;
+    $config['dependencies']['factories']['mongo_client'] = $mongoClientFactoryConfig['mongo_client'];
+}
+
+// Cache config if enabled
+if (isset($config['config_cache_enabled']) && $config['config_cache_enabled'] === true) {
+    file_put_contents($cachedConfigFile, '<?php return ' . var_export($config, true) . ';');
 }
 
 // Return an ArrayObject so we can inject the config as a service in Aura.Di