Rewrite continues:

[core.git] / framework / main / classes / resolver / command / console / class_ConsoleCommandResolver.php

diff --git a/framework/main/classes/resolver/command/console/class_ConsoleCommandResolver.php b/framework/main/classes/resolver/command/console/class_ConsoleCommandResolver.php
index 17a29204ba334b9b5b74b9d9610a87a3bb418c20..92840c2440c15af23427445deec7b49926015ecf 100644 (file)
--- a/framework/main/classes/resolver/command/console/class_ConsoleCommandResolver.php
+++ b/framework/main/classes/resolver/command/console/class_ConsoleCommandResolver.php
@@ -5,10 +5,12 @@ namespace CoreFramework\Resolver\Command;
 // Import framework stuff
 use CoreFramework\Command\BaseCommand;
 use CoreFramework\Command\InvalidCommandException;
-use CoreFramework\Generic\EmptyVariableException;
 use CoreFramework\Manager\ManageableApplication;
 use CoreFramework\Resolver\Command\CommandResolver;
 
+// Import SPL stuff
+use \InvalidArgumentException;
+
 /**
  * A command resolver for local (non-hubbed) web commands
  *
@@ -51,7 +53,7 @@ class ConsoleCommandResolver extends BaseCommandResolver implements CommandResol
         * @param       $commandName                            The default command we shall execute
         * @param       $applicationInstance            An instance of a manageable application helper class
         * @return      $resolverInstance                       The prepared command resolver instance
-        * @throws      EmptyVariableException          Thrown if default command is not set
+        * @throws      InvalidArgumentException                Thrown if default command is not set
         * @throws      InvalidCommandException         Thrown if default command is invalid
         */
        public static final function createConsoleCommandResolver ($commandName, ManageableApplication $applicationInstance) {
@@ -61,7 +63,7 @@ class ConsoleCommandResolver extends BaseCommandResolver implements CommandResol
                // Is the variable $commandName set and the command is valid?
                if (empty($commandName)) {
                        // Then thrown an exception here
-                       throw new EmptyVariableException(array($resolverInstance, 'commandName'), self::EXCEPTION_UNEXPECTED_EMPTY_STRING);
+                       throw new InvalidArgumentException('Parameter "commandName" is empty');
                } elseif ($resolverInstance->isCommandValid($commandName) === false) {
                        // Invalid command found
                        throw new InvalidCommandException(array($resolverInstance, $commandName), self::EXCEPTION_INVALID_COMMAND);