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

added Config::has and default value for Config::get.

This commit is contained in:
Taylor Otwell 2011-06-21 19:44:04 -05:00
parent fcdcc656b4
commit adb583471b
1 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
system/config.php
View File

@ -9,35 +9,57 @@ class Config {
*/ */
private static $items = array(); private static $items = array();
/**
* Determine if a configuration item exists.
*
* @param string $key
* @return bool
*/
public static function has($key)
{
return ! is_null(static::get($key));
}
/** /**
* Get a configuration item. * Get a configuration item.
* *
* @param string $key * @param string $key
* @param string $default
* @return mixed * @return mixed
*/ */
public static function get($key) public static function get($key, $default = null)
{ {
// ----------------------------------------------------- // -----------------------------------------------------
// If a dot is not present, we will just return the // If a dot is not present, we will just return the
// entire configuration array. // entire configuration array.
//
// If the configuration file does not exist, the default
// value will be returned.
// ----------------------------------------------------- // -----------------------------------------------------
if(strpos($key, '.') === false) if(strpos($key, '.') === false)
{ {
static::load($key); static::load($key);
return static::$items[$key]; return (array_key_exists($key, static::$items)) ? static::$items[$key] : $default;
} }
list($file, $key) = static::parse($key); list($file, $key) = static::parse($key);
static::load($file); static::load($file);
if (array_key_exists($key, static::$items[$file])) // -----------------------------------------------------
// If the file doesn't exist, return the default.
// -----------------------------------------------------
if ( ! array_key_exists($file, static::$items))
{ {
return static::$items[$file][$key]; return $default;
} }
throw new \Exception("Configuration item [$key] is not defined."); // -----------------------------------------------------
// Return the configuration item. If the item doesn't
// exist, the default value will be returned.
// -----------------------------------------------------
return (array_key_exists($key, static::$items[$file])) ? static::$items[$file][$key] : $default;
} }
/** /**
@ -91,18 +113,13 @@ private static function parse($key)
public static function load($file) public static function load($file)
{ {
// ----------------------------------------------------- // -----------------------------------------------------
// If we have already loaded the file, bail out. // Bail out if already loaded or doesn't exist.
// ----------------------------------------------------- // -----------------------------------------------------
if (array_key_exists($file, static::$items)) if (array_key_exists($file, static::$items) or ! file_exists($path = APP_PATH.'config/'.$file.EXT))
{ {
return; return;
} }
if ( ! file_exists($path = APP_PATH.'config/'.$file.EXT))
{
throw new \Exception("Configuration file [$file] does not exist.");
}
// ----------------------------------------------------- // -----------------------------------------------------
// Load the configuration array into the array of items. // Load the configuration array into the array of items.
// The items array is keyed by filename. // The items array is keyed by filename.