We should implement no default resolver anymore

[core.git] / inc / classes / main / resolver / controller / class_BaseControllerResolver.php

diff --git a/inc/classes/main/resolver/controller/class_BaseControllerResolver.php b/inc/classes/main/resolver/controller/class_BaseControllerResolver.php
index 0c6d2bef84b416d54fdc77c1a53c0f848a3b5e2e..afe1db6e1eed83c17ba3b4d79f7fc4f307241433 100644 (file)
--- a/inc/classes/main/resolver/controller/class_BaseControllerResolver.php
+++ b/inc/classes/main/resolver/controller/class_BaseControllerResolver.php
@@ -53,6 +53,16 @@ class BaseControllerResolver extends BaseResolver {
                $this->controllerPrefix = $controllerPrefix;
        }
 
+       /**
+        * Getter for controller prefix
+        *
+        * @param       $controllerPrefix       Last validated controllerPrefix
+        * @return      void
+        */
+       protected final function getControllerPrefix () {
+               return $this->controllerPrefix;
+       }
+
        /**
         * Setter for controller name
         *
@@ -84,7 +94,7 @@ class BaseControllerResolver extends BaseResolver {
         */
        protected function loadController ($controllerName) {
                // Cache default command
-               $defaultController = $this->getConfigInstance()->readConfig('default_' . strtolower($this->getControllerPrefix()) . '_command');
+               $defaultController = $this->getConfigInstance()->getConfigEntry('default_' . strtolower($this->getControllerPrefix()) . '_command');
 
                // Init controller instance
                $controllerInstance = null;
@@ -116,17 +126,10 @@ class BaseControllerResolver extends BaseResolver {
                $resolverConfigEntry = '';
 
                // Try to read a config entry for our resolver including controller name... ;-)
-               try {
-                       // Create the resolver name
-                       $resolverConfigEntry = sprintf("%s_cmd_%s_resolver_class", strtolower($this->getControllerPrefix()), strtolower($controllerName));
-
-                       // Get the config, this will throw an exception if there is no special command resolver
-                       $resolverClass = $this->getConfigInstance()->readConfig($resolverConfigEntry);
-               } catch (ConfigEntryNotFoundException $e) {
-                       // Use default resolver entry
-                       // @TODO Maybe we need to log this?
-                       $resolverConfigEntry = $this->getControllerPrefix() . '_cmd_resolver_class';
-               }
+               $resolverConfigEntry = sprintf("%s_cmd_%s_resolver_class", strtolower($this->getControllerPrefix()), strtolower($controllerName));
+
+               // Get the config, this will throw an exception if there is no special command resolver
+               $resolverClass = $this->getConfigInstance()->getConfigEntry($resolverConfigEntry);
 
                // Initiate the resolver and controller
                $resolverInstance = ObjectFactory::createObjectByConfiguredName(