Continued:

- also include namespace here, may break code!

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/framework/main/classes/resolver/command/console/class_ConsoleCommandResolver.php b/framework/main/classes/resolver/command/console/class_ConsoleCommandResolver.php
index ae85aa7e3abad826a5b9daff9c6f6505feaaf6d8..7cd5109e78096b1e1d9b3bb5685b647005e4ff05 100644 (file)
--- a/framework/main/classes/resolver/command/console/class_ConsoleCommandResolver.php
+++ b/framework/main/classes/resolver/command/console/class_ConsoleCommandResolver.php
@@ -49,20 +49,24 @@ class ConsoleCommandResolver extends BaseCommandResolver implements CommandResol
        /**
         * Creates an instance of a Console command resolver with a given default command
         *
+        * @param       $namespace                                      Namespace of the command's class file
         * @param       $commandName                            The default command we shall execute
         * @return      $resolverInstance                       The prepared command resolver instance
         * @throws      InvalidArgumentException        Thrown if default command is not set
         * @throws      InvalidCommandException         Thrown if default command is invalid
         */
-       public static final function createConsoleCommandResolver ($commandName) {
+       public static final function createConsoleCommandResolver ($namespace, $commandName) {
                // Create the new instance
                $resolverInstance = new ConsoleCommandResolver();
 
                // Is the variable $commandName set and the command is valid?
-               if (empty($commandName)) {
+               if (empty($namespace)) {
+                       // Then thrown an exception here
+                       throw new InvalidArgumentException('Parameter "namespace" is empty');
+               } elseif (empty($commandName)) {
                        // Then thrown an exception here
                        throw new InvalidArgumentException('Parameter "commandName" is empty');
-               } elseif ($resolverInstance->isCommandValid($commandName) === false) {
+               } elseif (!$resolverInstance->isCommandValid($namespace, $commandName)) {
                        // Invalid command found
                        throw new InvalidCommandException(array($resolverInstance, $commandName), self::EXCEPTION_INVALID_COMMAND);
                }

diff --git a/framework/main/classes/resolver/controller/class_BaseControllerResolver.php b/framework/main/classes/resolver/controller/class_BaseControllerResolver.php
index 216aa11f89cbc587e13f5b078e1ad83eb6133979..c47e4df2fa825106fe248ab5fcd74c19766ba712 100644 (file)
--- a/framework/main/classes/resolver/controller/class_BaseControllerResolver.php
+++ b/framework/main/classes/resolver/controller/class_BaseControllerResolver.php
@@ -100,13 +100,11 @@ abstract class BaseControllerResolver extends BaseResolver {
                        throw new InvalidControllerException(array($this, $controllerName), self::EXCEPTION_INVALID_CONTROLLER);
                } // END - if
 
-               // Set default resolver config name
-               $resolverConfigEntry = '';
-
                // Try to read a config entry for our resolver including controller name... ;-)
                $resolverConfigEntry = sprintf('%s_cmd_%s_resolver_class', strtolower($this->getClassPrefix()), strtolower($controllerName));
 
                // Get the config, this will throw an exception if there is no special controller resolver
+               //* DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-CONTROLLER-RESOLVER: resolverConfigEntry=%s', $resolverConfigEntry));
                $resolverClass = $this->getConfigInstance()->getConfigEntry($resolverConfigEntry);
 
                // Initiate the resolver and controller