From 43a5933f0bcb7e7fc57b491a459548c70aa599a0 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sat, 26 May 2012 23:12:36 +0000
Subject: [PATCH] Now all dashes are converted to underscores in config class

---
 inc/config/class_FrameworkConfiguration.php | 30 ++++++++++++++++-----
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/inc/config/class_FrameworkConfiguration.php b/inc/config/class_FrameworkConfiguration.php
index a1dd6806..43383ad5 100644
--- 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?
@@ -177,6 +192,9 @@ class FrameworkConfiguration implements Registerable {
 	 * @throws	NoConfigEntryException	If a configuration element was not found
 	 */
 	public final function unsetConfigEntry ($configKey) {
+		// Convert dashes to underscore
+		$configEntry = $this->convertDashesToUnderscores($configEntry);
+
 		// Is the configuration entry there?
 		if (!$this->isConfigurationEntrySet($configKey)) {
 			// Entry was not found!
-- 
2.39.2