Continued:

[core.git] / framework / main / classes / resolver / controller / console / class_ConsoleControllerResolver.php

diff --git a/framework/main/classes/resolver/controller/console/class_ConsoleControllerResolver.php b/framework/main/classes/resolver/controller/console/class_ConsoleControllerResolver.php
index 191e212ce0e0924a7fd656ba364010244f4a2276..eccd32d8b677846d943a0e212ccb6a79a50e46e8 100644 (file)
--- a/framework/main/classes/resolver/controller/console/class_ConsoleControllerResolver.php
+++ b/framework/main/classes/resolver/controller/console/class_ConsoleControllerResolver.php
@@ -1,13 +1,14 @@
 <?php
 // Own namespace
-namespace CoreFramework\Resolver\Controller;
+namespace Org\Mxchange\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;
+use Org\Mxchange\CoreFramework\Controller\BaseController;
+use Org\Mxchange\CoreFramework\Resolver\Controller\ControllerResolver;
+use Org\Mxchange\CoreFramework\Resolver\Controller\BaseControllerResolver;
+
+// Import SPL stuff
+use \InvalidArgumentException;
 
 /**
  * A resolver for resolving controllers locally
@@ -50,27 +51,26 @@ class ConsoleControllerResolver extends BaseControllerResolver implements Contro
         *
         * @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      InvalidArgumentException                Thrown if default controller is not set
         * @throws      InvalidControllerException      Thrown if default controller is invalid
         */
-       public static final function createConsoleControllerResolver ($namespace, $controllerName, ManageableApplication $applicationInstance) {
+       public static final function createConsoleControllerResolver ($namespace, $controllerName) {
                // Create the new instance
                $resolverInstance = new ConsoleControllerResolver();
 
                // Is the variable $controllerName set and the controller is valid?
-               if (empty($controllerName)) {
+               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);
-               } elseif ($resolverInstance->isControllerValid($namespace, $controllerName) === FALSE) {
+                       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);
                }
 
-               // Set the application instance
-               $resolverInstance->setApplicationInstance($applicationInstance);
-
                // Set controller name
                $resolverInstance->setControllerName($controllerName);