Static method getInstance() conflicts with getInstance() in class BaseRegistry,

[core.git] / inc / config / class_FrameworkConfiguration.php

diff --git a/inc/config/class_FrameworkConfiguration.php b/inc/config/class_FrameworkConfiguration.php
index 70f0585895cc6e3ff6ae6ee89299e7e6485a56c5..5006ea46680ef43d5be943444fcf8ad34a7b905f 100644 (file)
--- 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
@@ -119,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) {
@@ -132,7 +132,7 @@ class FrameworkConfiguration implements Registerable {
                        throw new ConfigEntryIsEmptyException($this, self::EXCEPTION_CONFIG_ENTRY_IS_EMPTY);
                } 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
@@ -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]
 ?>