Rewrite continues:

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

diff --git a/framework/main/classes/resolver/controller/html/class_HtmlControllerResolver.php b/framework/main/classes/resolver/controller/html/class_HtmlControllerResolver.php
index bf9de8f556e175e67ae68be574a0854b556c0587..6a9c0c5090b1f14ce1d37bac63abd28dea01be01 100644 (file)
--- a/framework/main/classes/resolver/controller/html/class_HtmlControllerResolver.php
+++ b/framework/main/classes/resolver/controller/html/class_HtmlControllerResolver.php
@@ -4,11 +4,13 @@ namespace CoreFramework\Resolver\Controller;
 
 // Import framework stuff
 use CoreFramework\Controller\BaseController;
-use CoreFramework\Generic\EmptyVariableException;
 use CoreFramework\Manager\ManageableApplication;
 use CoreFramework\Resolver\Controller\ControllerResolver;
 use CoreFramework\Resolver\Controller\BaseControllerResolver;
 
+// Import SPL stuff
+use \InvalidArgumentException;
+
 /**
  * A resolver for resolving controllers locally
  *
@@ -52,17 +54,20 @@ class HtmlControllerResolver extends BaseControllerResolver implements Controlle
         * @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      InvalidArgumentException                Thrown if default controller is not set
         * @throws      InvalidControllerException      Thrown if default controller is invalid
         */
        public static final function createHtmlControllerResolver ($namespace, $controllerName, ManageableApplication $applicationInstance) {
                // Create the new instance
                $resolverInstance = new HtmlControllerResolver();
 
-               // Is the variable $controllerName set and the controller is valid?
-               if (empty($controllerName)) {
+               // Are all parameter set and the controller is valid?
+               if (empty($namespace)) {
+                       // Then thrown an exception here
+                       throw new InvalidArgumentException('Parameter "namespace" is empty');
+               } elseif (empty($controllerName)) {
                        // Then thrown an exception here
-                       throw new EmptyVariableException(array($resolverInstance, 'controllerName'), self::EXCEPTION_UNEXPECTED_EMPTY_STRING);
+                       throw new InvalidArgumentException('Parameter "controllerName" is empty');
                } elseif ($resolverInstance->isControllerValid($namespace, $controllerName) === false) {
                        // Invalid controller found
                        throw new InvalidControllerException(array($resolverInstance, $controllerName), self::EXCEPTION_INVALID_CONTROLLER);