X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fconfig%2Fclass_FrameworkConfiguration.php;h=938b67ba99c954a1265b1e44dedf1be577554eee;hb=907685768720562b2776d0f80ed832e0bd6e11a2;hp=65d742b5e22fbad84204ec309ab9dc079e0ba8a7;hpb=84e2207412d3c6ea9f940a83b2cdd4503509808a;p=core.git

diff --git a/inc/config/class_FrameworkConfiguration.php b/inc/config/class_FrameworkConfiguration.php
index 65d742b5..938b67ba 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, 2010 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 getInstance () {
 		// is the instance there?
 		if (is_null(self::$configInstance))  {
 			// Create a config instance
@@ -217,7 +217,7 @@ class FrameworkConfiguration implements Registerable {
 	 */
 	public function detectHttpSecured () {
 		// Default is null
-		$https = null;
+		$https = NULL;
 
 		// Is HTTPS set?
 		if ($this->isHttpSecured()) {
@@ -318,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]
 ?>