* @see ClassLoader
* @author Roland Haeder <webmaster@ship-simu.org>
* @version 0.0.0
- * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
+ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009, 2010 Core Developer Team
* @license GNU GPL 3.0 or any newer version
* @link http://www.ship-simu.org
*
*
* @return $configInstance An instance of this class
*/
- public final static function getInstance () {
+ public static final function getInstance () {
// is the instance there?
if (is_null(self::$configInstance)) {
// Create a config instance
set_magic_quotes_runtime($enableQuotes);
}
- /**
- * A private include loader
- *
- * @param $arrayObject The array object with all include files
- * @return void
- * @deprecated
- * @see ClassLoader
- */
- private function loadIncludes (ArrayObject $arrayObject) {
- // Load only if there are includes defined
- if (!is_null($arrayObject)) {
- for ($idx = $arrayObject->getIterator(); $idx->valid(); $idx->next()) {
- // Get include file
- $inc = $idx->current();
-
- // Is the file name really set?
- if (!empty($inc)) {
- // Base path is by default added
- $fqfn = $inc;
-
- // Base path added? (Uni* / Windows)
- if ((substr($inc, 0, 1) != '/') && (substr($inc, 1, 1) != ':')) {
- // Generate FQFN
- $fqfn = $this->getConfigEntry('base_path') . '/inc/extra/' . $inc;
- } // END - if
- } // END - if
-
- // Include them all here
- require($fqfn);
- }
- } // END - if
- }
-
/**
* Checks wether the given configuration entry is set
*
* @param $cfgEntry The configuration element
* @return $cfgValue The fetched configuration value
* @throws ConfigEntryIsEmptyException If $cfgEntry is empty
- * @throws ConfigEntryNotFoundException If a configuration element
+ * @throws NoConfigEntryException If a configuration element
* was not found
*/
public function getConfigEntry ($cfgEntry) {
if (empty($cfgEntry)) {
// Entry is empty
throw new ConfigEntryIsEmptyException($this, self::EXCEPTION_CONFIG_ENTRY_IS_EMPTY);
- } elseif (!$this->isConfigEntrySet($cfgEntry)) {
+ } elseif (!$this->isConfigurationEntrySet($cfgEntry)) {
// Entry was not found!
- throw new ConfigEntryNotFoundException(array(__CLASS__, $cfgEntry), self::EXCEPTION_CONFIG_ENTRY_WAS_NOT_FOUND);
+ throw new NoConfigEntryException(array(__CLASS__, $cfgEntry), self::EXCEPTION_CONFIG_ENTRY_WAS_NOT_FOUND);
}
// Return the requested value