Renamed more stuff (will break app_die(), so it needs fixing).

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

diff --git a/inc/config/class_FrameworkConfiguration.php b/inc/config/class_FrameworkConfiguration.php
index 43383ad5dc45fd1b68177038699f512e9cd969b7..a49d4aa966b06c1726daa6b4adb2ab3f10893af3 100644 (file)
--- a/inc/config/class_FrameworkConfiguration.php
+++ b/inc/config/class_FrameworkConfiguration.php
@@ -6,11 +6,11 @@
  * class loader. See inc/loader/class_ClassLoader.php for instance
  *
  * @see                        ClassLoader
- * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
+ * @link               http://www.shipsimu.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -97,8 +97,12 @@ class FrameworkConfiguration implements Registerable {
         * @return      void
         */
        public final function setDefaultTimezone ($zone) {
-               // At least 5.1.0 is required for this!
-               if (version_compare(phpversion(), '5.1.0')) {
+               // Is PHP version 5.1.0 or higher? Older versions are being ignored
+               if (version_compare(phpversion(), '5.1.0', '>=')) {
+                       /*
+                        * Set desired time zone to prevent date() and related functions to
+                        * issue a E_WARNING.
+                        */
                        date_default_timezone_set($zone);
                } // END - if
        }
@@ -108,8 +112,15 @@ class FrameworkConfiguration implements Registerable {
         *
         * @param       $enableQuotes   Whether enable magic runtime quotes (should be disabled for security reasons)
         * @return      void
+        * @todo        This method encapsulates a deprecated PHP function and should be deprecated, too.
         */
        public final function setMagicQuotesRuntime ($enableQuotes) {
+               // Is the PHP version < 5.4?
+               if (version_compare(phpversion(), '5.4', '>=')) {
+                       // Then silently skip this part as set_magic_quotes_runtime() is deprecated
+                       return;
+               } // END - if
+
                // Cast it to boolean
                $enableQuotes = (boolean) $enableQuotes;
 
@@ -123,7 +134,7 @@ class FrameworkConfiguration implements Registerable {
         * @param       $configEntry    The configuration entry we shall check
         * @return      $isset                  Whether the given configuration entry is set
         */
-       protected function isConfigurationEntrySet ($configEntry) {
+       public function isConfigurationEntrySet ($configEntry) {
                // Is it set?
                $isset = isset($this->config[$configEntry]);
 
@@ -187,22 +198,22 @@ class FrameworkConfiguration implements Registerable {
         * Unset a configuration entry, the entry must be there or else an
         * exception is thrown.
         *
-        * @param       $configKey      Configuration entry to unset
+        * @param       $configEntry    Configuration entry to unset
         * @return      void
         * @throws      NoConfigEntryException  If a configuration element was not found
         */
-       public final function unsetConfigEntry ($configKey) {
+       public final function unsetConfigEntry ($configEntry) {
                // Convert dashes to underscore
                $configEntry = $this->convertDashesToUnderscores($configEntry);
 
                // Is the configuration entry there?
-               if (!$this->isConfigurationEntrySet($configKey)) {
+               if (!$this->isConfigurationEntrySet($configEntry)) {
                        // Entry was not found!
-                       throw new NoConfigEntryException(array(__CLASS__, $configKey), self::EXCEPTION_CONFIG_ENTRY_WAS_NOT_FOUND);
+                       throw new NoConfigEntryException(array(__CLASS__, $configEntry), self::EXCEPTION_CONFIG_ENTRY_WAS_NOT_FOUND);
                } // END - if
 
                // Unset it
-               unset($this->config[$configKey]);
+               unset($this->config[$configEntry]);
        }
 
        /**