X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fmain%2Fclasses%2Fresolver%2Fcontroller%2Fhtml%2Fclass_HtmlControllerResolver.php;h=0890dff5da22dac72df8f598af0e305bcb71c9fb;hp=8882dbdbb58187263dc242b97462d9aeff594d59;hb=015c9d406c90225160488fcaaebe4575ce5cf61a;hpb=021618e8e583e2101b2393c21e7d74f509479ddc diff --git a/inc/main/classes/resolver/controller/html/class_HtmlControllerResolver.php b/inc/main/classes/resolver/controller/html/class_HtmlControllerResolver.php index 8882dbdb..0890dff5 100644 --- a/inc/main/classes/resolver/controller/html/class_HtmlControllerResolver.php +++ b/inc/main/classes/resolver/controller/html/class_HtmlControllerResolver.php @@ -3,6 +3,7 @@ namespace CoreFramework\Resolver\Controller; // Import framework stuff +use CoreFramework\Controller\BaseController; use CoreFramework\Manager\ManageableApplication; /** @@ -44,13 +45,14 @@ class HtmlControllerResolver extends BaseControllerResolver implements Controlle /** * Creates an instance of a resolver class with a given controller * + * @param $namespace Namespace to look in * @param $controllerName The controller we shall resolve * @param $applicationInstance An instance of a manageable application helper class * @return $resolverInstance The prepared controller resolver instance * @throws EmptyVariableException Thrown if default controller is not set * @throws InvalidControllerException Thrown if default controller is invalid */ - public static final function createHtmlControllerResolver ($controllerName, ManageableApplication $applicationInstance) { + public static final function createHtmlControllerResolver ($namespace, $controllerName, ManageableApplication $applicationInstance) { // Create the new instance $resolverInstance = new HtmlControllerResolver(); @@ -58,7 +60,7 @@ class HtmlControllerResolver extends BaseControllerResolver implements Controlle if (empty($controllerName)) { // Then thrown an exception here throw new EmptyVariableException(array($resolverInstance, 'controllerName'), self::EXCEPTION_UNEXPECTED_EMPTY_STRING); - } elseif ($resolverInstance->isControllerValid($controllerName) === FALSE) { + } elseif ($resolverInstance->isControllerValid($namespace, $controllerName) === FALSE) { // Invalid controller found throw new InvalidControllerException(array($resolverInstance, $controllerName), self::EXCEPTION_INVALID_CONTROLLER); }