0ct0pu5/Pico
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Modular config: Load config from any config/*.config.php

Browse source 
Resolves #330

After loading the `config/config.php`, Pico proceeds with any existing `config/*.config.php` in alphabetical order. The file order is crucial: Config values which has been set already, cannot be overwritten by a succeeding file. This is also true for arrays, i.e. when specifying `$config['test'] = array('foo' => 'bar')` in `config/a.config.php` and `$config['test'] = array('baz' => 42)` in `config/b.config.php`, `$config['test']['baz']` will be undefined
This commit is contained in:
Daniel Rudolf 2016-03-06 20:54:58 +01:00
parent cd74b681f5
commit 988a23fd02
1 changed files with 34 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
lib/Pico.php
View file

@ -506,7 +506,15 @@ class Pico
}
/**
* Loads the config.php from Pico::$configDir
* Loads the config.php and any *.config.php from Pico::$configDir
*
* After loading the {@path "config/config.php"}, Pico proceeds with any
* existing {@path "config/*.config.php"} in alphabetical order. The file
* order is crucial: Config values which has been set already, cannot be
* overwritten by a succeeding file. This is also true for arrays,
* i.e. when specifying `$config['test'] = array('foo' => 'bar')` in
* `config/a.config.php` and `$config['test'] = array('baz' => 42)` in
* `config/b.config.php`, `$config['test']['baz']` will be undefined!
*
* @see Pico::setConfig()
* @see Pico::getConfig()
@ -514,20 +522,33 @@ class Pico
*/
protected function loadConfig()
{
$config = null;
if (file_exists($this->getConfigDir() . 'config.php')) {
// scope isolated require()
$includeClosure = function ($configFile) use (&$config) {
require($configFile);
};
if (PHP_VERSION_ID >= 50400) {
$includeClosure = $includeClosure->bindTo(null);
}
$includeClosure($this->getConfigDir() . 'config.php');
// scope isolated require()
$includeClosure = function ($configFile) {
require($configFile);
return (isset($config) && is_array($config)) ? $config : array();
};
if (PHP_VERSION_ID >= 50400) {
$includeClosure = $includeClosure->bindTo(null);
}
$defaultConfig = array(
// load main config file (config/config.php)
$this->config = is_array($this->config) ? $this->config : array();
if (file_exists($this->getConfigDir() . 'config.php')) {
$this->config += $includeClosure($this->getConfigDir() . 'config.php');
}
// merge $config of config/*.config.php files
$configFiles = glob($this->getConfigDir() . '?*.config.php', GLOB_MARK);
if ($configFiles) {
foreach ($configFiles as $configFile) {
if (substr($configFile, -1) !== '/') {
$this->config += $includeClosure($configFile);
}
}
}
// merge default config
$this->config += array(
'site_title' => 'Pico',
'base_url' => '',
'rewrite_url' => null,
@ -541,9 +562,6 @@ class Pico
'timezone' => ''
);
$this->config = is_array($this->config) ? $this->config : array();
$this->config += is_array($config) ? $config + $defaultConfig : $defaultConfig;
if (empty($this->config['base_url'])) {
$this->config['base_url'] = $this->getBaseUrl();
} else {