Continued:

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

diff --git a/inc/main/classes/resolver/controller/html/class_HtmlControllerResolver.php b/inc/main/classes/resolver/controller/html/class_HtmlControllerResolver.php
index a90bb66bfdbd22e850ceccbcd144149ddb347721..0890dff5da22dac72df8f598af0e305bcb71c9fb 100644 (file)
--- 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);
                }
@@ -72,7 +74,5 @@ class HtmlControllerResolver extends BaseControllerResolver implements Controlle
                // Return the prepared instance
                return $resolverInstance;
        }
-}
 
-// [EOF]
-?>
+}