projects
/
core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
010c49b
)
Now all dashes are converted to underscores in config class
author
Roland Häder
<roland@mxchange.org>
Sat, 26 May 2012 23:12:36 +0000
(23:12 +0000)
committer
Roland Häder
<roland@mxchange.org>
Sat, 26 May 2012 23:12:36 +0000
(23:12 +0000)
inc/config/class_FrameworkConfiguration.php
patch
|
blob
|
history
diff --git
a/inc/config/class_FrameworkConfiguration.php
b/inc/config/class_FrameworkConfiguration.php
index a1dd68061a3c7ef829092fd710899a3418a8f664..43383ad5dc45fd1b68177038699f512e9cd969b7 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
*
/**
* Compatiblity method to return this class' name
*
- * @return __CLASS__
This class' name
+ * @return __CLASS__ This class' name
*/
public function __toString () {
return get_class($this);
}
/**
*/
public function __toString () {
return get_class($this);
}
/**
- * Getter for an instance of this class
+ * Getter for a
singleto
n instance of this class
*
*
- * @return $configInstance
A
n instance of this class
+ * @return $configInstance
A singleto
n instance of this class
*/
public static final function getSelfInstance () {
// is the instance there?
*/
public static final function getSelfInstance () {
// is the instance there?
@@
-72,9
+72,24
@@
class FrameworkConfiguration implements Registerable {
self::$configInstance = new FrameworkConfiguration();
} // END - if
self::$configInstance = new FrameworkConfiguration();
} // END - if
+ // Return singleton instance
return self::$configInstance;
}
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!)
*
/**
* 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) {
* @throws NoConfigEntryException If a configuration element was not found
*/
public function getConfigEntry ($configEntry) {
- // C
ast to string
- $configEntry =
(string) $configEntry
;
+ // C
onvert dashes to underscore
+ $configEntry =
$this->convertDashesToUnderscores($configEntry)
;
// Is a valid configuration entry provided?
if (empty($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
*/
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?
$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) {
* @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!
// Is the configuration entry there?
if (!$this->isConfigurationEntrySet($configKey)) {
// Entry was not found!