Renamed variables, removeVariable() does not expect indexes

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

diff --git a/inc/config/class_FrameworkConfiguration.php b/inc/config/class_FrameworkConfiguration.php
index 6743ab4b59e023da085290c3226b3d40f91856c7..20d80cd6b365d3e48659c0119346b1c5d3f1ad3d 100644 (file)
--- a/inc/config/class_FrameworkConfiguration.php
+++ b/inc/config/class_FrameworkConfiguration.php
@@ -54,16 +54,16 @@ class FrameworkConfiguration implements Registerable {
        /**
         * Compatiblity method to return this class' name
         *
-        * @return      __CLASS__               This class' name
+        * @return      __CLASS__       This class' name
         */
        public function __toString () {
                return get_class($this);
        }
 
        /**
-        * Getter for an instance of this class
+        * Getter for a singleton instance of this class
         *
-        * @return      $configInstance An instance of this class
+        * @return      $configInstance         A singleton instance of this class
         */
        public static final function getSelfInstance () {
                // is the instance there?
@@ -72,9 +72,24 @@ class FrameworkConfiguration implements Registerable {
                        self::$configInstance = new FrameworkConfiguration();
                } // END - if
 
+               // Return singleton instance
                return self::$configInstance;
        }
 
+       /**
+        * Converts dashes to underscores, e.g. useable for configuration entries
+        *
+        * @param       $str    The string with maybe dashes inside
+        * @return      $str    The converted string with no dashed, but underscores
+        */
+       private final function convertDashesToUnderscores ($str) {
+               // Convert them all
+               $str = str_replace('-', '_', $str);
+
+               // Return converted string
+               return $str;
+       }
+
        /**
         * Setter for default time zone (must be correct!)
         *
@@ -125,8 +140,8 @@ class FrameworkConfiguration implements Registerable {
         * @throws      NoConfigEntryException  If a configuration element was not found
         */
        public function getConfigEntry ($configEntry) {
-               // Cast to string
-               $configEntry = (string) $configEntry;
+               // Convert dashes to underscore
+               $configEntry = $this->convertDashesToUnderscores($configEntry);
 
                // Is a valid configuration entry provided?
                if (empty($configEntry)) {
@@ -151,7 +166,7 @@ class FrameworkConfiguration implements Registerable {
         */
        public final function setConfigEntry ($configEntry, $configValue) {
                // Cast to string
-               $configEntry = (string) $configEntry;
+               $configEntry = $this->convertDashesToUnderscores($configEntry);
                $configValue = (string) $configValue;
 
                // Is a valid configuration entry provided?
@@ -161,6 +176,7 @@ class FrameworkConfiguration implements Registerable {
                } // END - if
 
                // Set the configuration value
+               /* NOISY-DEBUG: */ print(__METHOD__ . ':configEntry=' . $configEntry . ',configValue=' . $configValue . PHP_EOL);
                $this->config[$configEntry] = $configValue;
 
                // Resort the array
@@ -171,11 +187,14 @@ 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($configEntry)) {
                        // Entry was not found!
@@ -183,7 +202,7 @@ class FrameworkConfiguration implements Registerable {
                } // END - if
 
                // Unset it
-               unset($this->config[$configKey]);
+               unset($this->config[$configEntry]);
        }
 
        /**