Continued:

[core.git] / framework / main / tests / resolver / controller / class_TestsConsoleControllerResolver.php

diff --git a/framework/main/tests/resolver/controller/class_TestsConsoleControllerResolver.php b/framework/main/tests/resolver/controller/class_TestsConsoleControllerResolver.php
index e3761edf8527a6a9b4aa3334295af49f48567996..ed861f3506f91d250d257e982c26e95d90f63803 100644 (file)
--- a/framework/main/tests/resolver/controller/class_TestsConsoleControllerResolver.php
+++ b/framework/main/tests/resolver/controller/class_TestsConsoleControllerResolver.php
@@ -1,13 +1,12 @@
 <?php
 // Own namespace
-namespace CoreFramework\Tests\Resolver\Controller;
+namespace Org\Mxchange\CoreFramework\Tests\Resolver\Controller;
 
 // Import framework stuff
-use CoreFramework\Controller\BaseController;
-use CoreFramework\Controller\Controller;
-use CoreFramework\Manager\ManageableApplication;
-use CoreFramework\Resolver\Controller\BaseControllerResolver;
-use CoreFramework\Resolver\Controller\ControllerResolver;
+use Org\Mxchange\CoreFramework\Controller\BaseController;
+use Org\Mxchange\CoreFramework\Controller\Controller;
+use Org\Mxchange\CoreFramework\Resolver\Controller\BaseControllerResolver;
+use Org\Mxchange\CoreFramework\Resolver\Controller\ControllerResolver;
 
 // Import SPL stuff
 use \InvalidArgumentException;
@@ -52,12 +51,11 @@ class TestsConsoleControllerResolver extends BaseControllerResolver implements C
         * Creates an instance of a resolver class with a given command
         *
         * @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      InvalidArgumentException                Thrown if default command is not set
         * @throws      InvalidControllerException      Thrown if default controller is invalid
         */
-       public static final function createTestsConsoleControllerResolver ($controllerName, ManageableApplication $applicationInstance) {
+       public static final function createTestsConsoleControllerResolver ($controllerName) {
                // Create the new instance
                $resolverInstance = new TestsConsoleControllerResolver();
 
@@ -65,16 +63,13 @@ class TestsConsoleControllerResolver extends BaseControllerResolver implements C
                if (empty($controllerName)) {
                        // Then thrown an exception here
                        throw new InvalidArgumentException('Parameter "controllerName" is empty');
-               } elseif ($resolverInstance->isControllerValid('CoreFramework\Tests\Controller', $controllerName) === false) {
+               } elseif ($resolverInstance->isControllerValid('Org\Mxchange\CoreFramework\Tests\Controller', $controllerName) === false) {
                        // Invalid command found
                        throw new InvalidControllerException(array($resolverInstance, $controllerName), self::EXCEPTION_INVALID_CONTROLLER);
                }
 
-               // Set the application instance
-               $resolverInstance->setApplicationInstance($applicationInstance);
-
                // Set namespace and controller name
-               $resolverInstance->setNamespace('CoreFramework\Tests\Controller');
+               $resolverInstance->setNamespace('Org\Mxchange\CoreFramework\Tests\Controller');
                $resolverInstance->setControllerName($controllerName);
 
                // Return the prepared instance