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

refactoring config class.

This commit is contained in:
Taylor Otwell 2011-07-07 23:16:52 -05:00
parent 8203bd9af5
commit 6e93237ec9
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
system/config.php
View File

@ -10,7 +10,7 @@ class Config {
private static $items = array(); private static $items = array();
/** /**
* Determine if a configuration item exists. * Determine if a configuration item or file exists.
* *
* @param string $key * @param string $key
* @return bool * @return bool
@ -23,14 +23,20 @@ public static function has($key)
/** /**
* Get a configuration item. * Get a configuration item.
* *
* Configuration items are retrieved using "dot" notation. So, asking for the
* "application.timezone" configuration item would return the "timezone" option
* from the "application" configuration file.
*
* If the name of a configuration file is passed without specifying an item, the
* entire configuration array will be returned.
*
* @param string $key * @param string $key
* @param string $default * @param string $default
* @return mixed * @return array
*/ */
public static function get($key, $default = null) public static function get($key, $default = null)
{ {
// If no "dot" is present in the key, return the entire configuration array. if (strpos($key, '.') === false)
if(strpos($key, '.') === false)
{ {
static::load($key); static::load($key);
@ -41,7 +47,6 @@ public static function get($key, $default = null)
static::load($file); static::load($file);
// Verify that the configuration file actually exists.
if ( ! array_key_exists($file, static::$items)) if ( ! array_key_exists($file, static::$items))
{ {
return is_callable($default) ? call_user_func($default) : $default; return is_callable($default) ? call_user_func($default) : $default;
@ -69,13 +74,14 @@ public static function set($key, $value)
/** /**
* Parse a configuration key. * Parse a configuration key.
* *
* The value on the left side of the dot is the configuration file
* name, while the right side of the dot is the item within that file.
*
* @param string $key * @param string $key
* @return array * @return array
*/ */
private static function parse($key) private static function parse($key)
{ {
// The left side of the dot is the file name, while the right side of the dot
// is the item within that file being requested.
$segments = explode('.', $key); $segments = explode('.', $key);
if (count($segments) < 2) if (count($segments) < 2)
@ -94,13 +100,10 @@ private static function parse($key)
*/ */
public static function load($file) public static function load($file)
{ {
// Bail out if already loaded or doesn't exist. if ( ! array_key_exists($file, static::$items) and file_exists($path = APP_PATH.'config/'.$file.EXT))
if (array_key_exists($file, static::$items) or ! file_exists($path = APP_PATH.'config/'.$file.EXT))
{ {
return; static::$items[$file] = require $path;
} }
static::$items[$file] = require $path;
} }
} }