Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor the config class for more simplicity.

This commit is contained in:
Taylor Otwell 2011-08-15 15:06:27 -05:00
parent cd90845acc
commit d9b7b7dc52
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
system/config.php
View File

@ -40,10 +40,7 @@ public static function get($key, $default = null)
{ {
list($module, $file, $key) = static::parse($key); list($module, $file, $key) = static::parse($key);
if ( ! static::load($module, $file)) static::load($module, $file);
{
return is_callable($default) ? call_user_func($default) : $default;
}
if (is_null($key)) return static::$items[$module][$file]; if (is_null($key)) return static::$items[$module][$file];
@ -63,16 +60,13 @@ public static function set($key, $value)
{ {
list($module, $file, $key) = static::parse($key); list($module, $file, $key) = static::parse($key);
if ( ! static::load($module, $file)) static::load($module, $file);
{
throw new \Exception("Error setting configuration option. Option [$key] is not defined.");
}
(is_null($key)) ? static::$items[$module][$file] = $value : Arr::set(static::$items[$module][$file], $key, $value); (is_null($key)) ? static::$items[$module][$file] = $value : Arr::set(static::$items[$module][$file], $key, $value);
} }
/** /**
* Parse a configuration key into its module, file, and key parts. * Parse a configuration key into its module, file, and key segments.
* *
* @param string $key * @param string $key
* @return array * @return array
@ -96,11 +90,11 @@ private static function parse($key)
* *
* @param string $file * @param string $file
* @param string $module * @param string $module
* @return bool * @return void
*/ */
private static function load($module, $file) private static function load($module, $file)
{ {
if (isset(static::$items[$module]) and array_key_exists($file, static::$items[$module])) return true; if (isset(static::$items[$module][$file])) return true;
$path = ($module === 'application') ? CONFIG_PATH : MODULE_PATH.$module.'/config/'; $path = ($module === 'application') ? CONFIG_PATH : MODULE_PATH.$module.'/config/';
@ -114,9 +108,7 @@ private static function load($module, $file)
$config = array_merge($config, require $path); $config = array_merge($config, require $path);
} }
if (count($config) > 0) static::$items[$module][$file] = $config; static::$items[$module][$file] = $config;
return isset(static::$items[$module][$file]);
} }
} }