X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fconfig%2Fclass_FrameworkConfiguration.php;h=5006ea46680ef43d5be943444fcf8ad34a7b905f;hb=768cc231b262ebeaa5aec373d9b7d97cc6b6ac95;hp=283ad69a95b8cd8333345a77a2e519d9e2f65a79;hpb=47a6960661d9daa28ad7d2aedef359a3ec888642;p=core.git

diff --git a/inc/config/class_FrameworkConfiguration.php b/inc/config/class_FrameworkConfiguration.php
index 283ad69a..5006ea46 100644
--- a/inc/config/class_FrameworkConfiguration.php
+++ b/inc/config/class_FrameworkConfiguration.php
@@ -8,7 +8,7 @@
  * @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 - 2011 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -36,7 +36,7 @@ class FrameworkConfiguration implements Registerable {
 	/**
 	 * The configuration instance itself
 	 */
-	private static $configInstance = null;
+	private static $configInstance = NULL;
 
 	// Some constants for the configuration system
 	const EXCEPTION_CONFIG_ENTRY_IS_EMPTY      = 0x130;
@@ -65,7 +65,7 @@ class FrameworkConfiguration implements Registerable {
 	 *
 	 * @return	$configInstance	An instance of this class
 	 */
-	public final static function getInstance () {
+	public static final function getSelfInstance () {
 		// is the instance there?
 		if (is_null(self::$configInstance))  {
 			// Create a config instance
@@ -99,39 +99,6 @@ class FrameworkConfiguration implements Registerable {
 		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
 	 *
@@ -152,7 +119,7 @@ class FrameworkConfiguration implements Registerable {
 	 * @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) {
@@ -163,9 +130,9 @@ class FrameworkConfiguration implements Registerable {
 		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
@@ -250,7 +217,7 @@ class FrameworkConfiguration implements Registerable {
 	 */
 	public function detectHttpSecured () {
 		// Default is null
-		$https = null;
+		$https = NULL;
 
 		// Is HTTPS set?
 		if ($this->isHttpSecured()) {
@@ -351,7 +318,26 @@ class FrameworkConfiguration implements Registerable {
 	public function hashCode () {
 		return crc32($this->__toString());
 	}
+
+	/**
+	 * Checks wether an object equals this object. You should overwrite this
+	 * method to implement own equality checks
+	 *
+	 * @param	$objectInstance		An instance of a FrameworkInterface object
+	 * @return	$equals				Wether both objects equals
+	 */
+	public function equals (FrameworkInterface $objectInstance) {
+		// Now test it
+		$equals = ((
+			$this->__toString() == $objectInstance->__toString()
+		) && (
+			$this->hashCode() == $objectInstance->hashCode()
+		));
+
+		// Return the result
+		return $equals;
+	}
 }
 
-//
+// [EOF]
 ?>