X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fresolver%2Fcontroller%2Fimage%2Fclass_ImageControllerResolver.php;h=02024241224bf99dfc97c9dcbd3a37f996f1bade;hp=7ec7c537df3cd3178aa18cd397c2abbf1e3620c9;hb=b002c5909aa0f781505dde5414964b0f014cde01;hpb=146c8b3c929a1b0ab17d6605e5ae949ac44899c1

diff --git a/framework/main/classes/resolver/controller/image/class_ImageControllerResolver.php b/framework/main/classes/resolver/controller/image/class_ImageControllerResolver.php
index 7ec7c537..02024241 100644
--- a/framework/main/classes/resolver/controller/image/class_ImageControllerResolver.php
+++ b/framework/main/classes/resolver/controller/image/class_ImageControllerResolver.php
@@ -1,13 +1,15 @@
 <?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\Manager\ManageableApplication;
+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
@@ -52,17 +54,20 @@ class ImageControllerResolver extends BaseControllerResolver implements Controll
 	 * @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 createImageControllerResolver ($namespace, $controllerName, ManageableApplication $applicationInstance) {
 		// Create the new instance
 		$resolverInstance = new ImageControllerResolver();
 
-		// 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);