X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fresolver%2Fcommand%2Fhtml%2Fclass_HtmlCommandResolver.php;h=1a407690bbc35772dd2126941252d3215931a1c3;hb=HEAD;hp=2ed244b06d56092ff76fbae00e1d5d6ea26a1185;hpb=146c8b3c929a1b0ab17d6605e5ae949ac44899c1;p=core.git

diff --git a/framework/main/classes/resolver/command/html/class_HtmlCommandResolver.php b/framework/main/classes/resolver/command/html/class_HtmlCommandResolver.php
index 2ed244b0..46ee3eae 100644
--- a/framework/main/classes/resolver/command/html/class_HtmlCommandResolver.php
+++ b/framework/main/classes/resolver/command/html/class_HtmlCommandResolver.php
@@ -1,19 +1,21 @@
 <?php
 // Own namespace
-namespace CoreFramework\Resolver\Command;
+namespace Org\Mxchange\CoreFramework\Resolver\Command;
 
 // Import framework stuff
-use CoreFramework\Command\InvalidCommandException;
-use CoreFramework\Generic\EmptyVariableException;
-use CoreFramework\Manager\ManageableApplication;
-use CoreFramework\Resolver\Command\CommandResolver;
+use Org\Mxchange\CoreFramework\Command\InvalidCommandException;
+use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
+use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
+
+// Import SPL stuff
+use \InvalidArgumentException;
 
 /**
  * A command resolver for local (non-hubbed) HTML commands
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2023 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *
@@ -41,7 +43,7 @@ class HtmlCommandResolver extends BaseCommandResolver implements CommandResolver
 	 *
 	 * @return	void
 	 */
-	protected function __construct () {
+	private function __construct () {
 		// Call parent constructor
 		parent::__construct(__CLASS__);
 
@@ -53,27 +55,24 @@ class HtmlCommandResolver extends BaseCommandResolver implements CommandResolver
 	 * Creates an instance of a Html command resolver with a given default command
 	 *
 	 * @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 createHtmlCommandResolver ($commandName, ManageableApplication $applicationInstance) {
+	public static final function createHtmlCommandResolver (string $commandName) {
 		// Create the new instance
 		$resolverInstance = new HtmlCommandResolver();
 
 		// 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', FrameworkInterface::EXCEPTION_INVALID_ARGUMENT);
 		} elseif ($resolverInstance->isCommandValid($commandName) === false) {
 			// Invalid command found
+			// @TODO Missing namespace!
 			throw new InvalidCommandException(array($resolverInstance, $commandName), self::EXCEPTION_INVALID_COMMAND);
 		}
 
-		// Set the application instance
-		$resolverInstance->setApplicationInstance($applicationInstance);
-
 		// Return the prepared instance
 		return $resolverInstance;
 	}