X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fresolver%2Fcontroller%2Fclass_BaseControllerResolver.php;h=afe1db6e1eed83c17ba3b4d79f7fc4f307241433;hp=ece1f26d8b64679c905dcf762235a46374ec4336;hb=9d7541b95f66a80947abfc28097b8cad54ff104b;hpb=7e46f248cc9eb9a3cd540b2e864e053f40a46bcd diff --git a/inc/classes/main/resolver/controller/class_BaseControllerResolver.php b/inc/classes/main/resolver/controller/class_BaseControllerResolver.php index ece1f26d..afe1db6e 100644 --- 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(