Continued a bit:

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

diff --git a/inc/config/class_FrameworkConfiguration.php b/inc/config/class_FrameworkConfiguration.php
index a3bcb84a6ed6a2d0b733c150238657c3c4285fe7..c61dcf4a999f0928614266e4fde078d9e5ca401a 100644 (file)
--- a/inc/config/class_FrameworkConfiguration.php
+++ b/inc/config/class_FrameworkConfiguration.php
@@ -182,7 +182,10 @@ class FrameworkConfiguration implements Registerable {
                $configKey = self::convertDashesToUnderscores($configKey);
 
                // Is a valid configuration key key provided?
-               if ((empty($configKey)) || (!is_string($configKey))) {
+               if (is_null($configKey)) {
+                       // Configuration key is null
+                       throw new NullPointerException($this, self::EXCEPTION_IS_NULL_POINTER);
+               } elseif ((empty($configKey)) || (!is_string($configKey))) {
                        // Entry is empty
                        throw new ConfigEntryIsEmptyException($this, self::EXCEPTION_CONFIG_KEY_IS_EMPTY);
                } elseif ((is_null($configValue)) || (is_array($configValue)) || (is_object($configValue)) || (is_resource($configValue))) {
@@ -363,6 +366,7 @@ class FrameworkConfiguration implements Registerable {
         */
        public final function getField ($fieldName) {
                // Our super interface "FrameworkInterface" requires this
+               throw new UnsupportedOperationException(array($this, __FUNCTION__), self::EXCEPTION_UNSPPORTED_OPERATION);
        }
 
        /**
@@ -374,6 +378,7 @@ class FrameworkConfiguration implements Registerable {
         */
        public function isFieldSet ($fieldName) {
                // Our super interface "FrameworkInterface" requires this
+               throw new UnsupportedOperationException(array($this, __FUNCTION__), self::EXCEPTION_UNSPPORTED_OPERATION);
        }
 
        /**