X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=application%2Fhub%2Fmain%2Fresolver%2Fcommand%2Fconsole%2Fclass_HubConsoleCommandResolver.php;h=d998270310818af78ae2f429f89b35b3010c1199;hb=44314097c8abbfef2ee703eeda601dffd22520af;hp=19811af95f3a73b91e99e1dff464f7c46e6f24d3;hpb=f33fd598a1a77034720172ea80353e4d4c0f9662;p=hub.git

diff --git a/application/hub/main/resolver/command/console/class_HubConsoleCommandResolver.php b/application/hub/main/resolver/command/console/class_HubConsoleCommandResolver.php
index 19811af95..d99827031 100644
--- a/application/hub/main/resolver/command/console/class_HubConsoleCommandResolver.php
+++ b/application/hub/main/resolver/command/console/class_HubConsoleCommandResolver.php
@@ -2,11 +2,11 @@
 /**
  * A command resolver for local (non-hubbed) web commands
  *
- * @author		Roland Haeder <webmaster@ship-simu.org>
+ * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009, 2010 Hub Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2014 Hub Developer Team
  * @license		GNU GPL 3.0 or any newer version
- * @link		http://www.ship-simu.org
+ * @link		http://www.shipsimu.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,11 +22,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 class HubConsoleCommandResolver extends BaseCommandResolver implements CommandResolver {
-	/**
-	 * Last successfull resolved command
-	 */
-	private $lastCommandInstance = null;
-
 	/**
 	 * Protected constructor
 	 *
@@ -37,19 +32,19 @@ class HubConsoleCommandResolver extends BaseCommandResolver implements CommandRe
 		parent::__construct(__CLASS__);
 
 		// Set prefix to "HubConsole"
-		$this->setCommandPrefix("HubConsole");
+		$this->setClassPrefix('HubConsole');
 	}
 
 	/**
 	 * Creates an instance of a HubConsole command resolver with a given default command
 	 *
 	 * @param	$commandName				The default command we shall execute
-	 * @param	$appInstance				An instance of a manageable application helper class
+	 * @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	InvalidCommandException		Thrown if default command is invalid
 	 */
-	public static final function createHubConsoleCommandResolver ($commandName, ManageableApplication $appInstance) {
+	public static final function createHubConsoleCommandResolver ($commandName, ManageableApplication $applicationInstance) {
 		// Create the new instance
 		$resolverInstance = new HubConsoleCommandResolver();
 
@@ -57,13 +52,13 @@ class HubConsoleCommandResolver extends BaseCommandResolver implements CommandRe
 		if (empty($commandName)) {
 			// Then thrown an exception here
 			throw new EmptyVariableException(array($resolverInstance, 'commandName'), self::EXCEPTION_UNEXPECTED_EMPTY_STRING);
-		} elseif ($resolverInstance->isCommandValid($commandName) === false) {
+		} elseif ($resolverInstance->isCommandValid($commandName) === FALSE) {
 			// Invalid command found
 			throw new InvalidCommandException(array($resolverInstance, $commandName), self::EXCEPTION_INVALID_COMMAND);
 		}
 
 		// Set the application instance
-		$resolverInstance->setApplicationInstance($appInstance);
+		$resolverInstance->setApplicationInstance($applicationInstance);
 
 		// Return the prepared instance
 		return $resolverInstance;
@@ -83,7 +78,7 @@ class HubConsoleCommandResolver extends BaseCommandResolver implements CommandRe
 	public function resolveCommandByRequest (Requestable $requestInstance) {
 		// Init variables
 		$commandName = '';
-		$commandInstance = null;
+		$commandInstance = NULL;
 
 		// This goes fine so let's resolve the command
 		$commandName = $requestInstance->getRequestElement('command');
@@ -92,7 +87,7 @@ class HubConsoleCommandResolver extends BaseCommandResolver implements CommandRe
 		if (empty($commandName)) $commandName = $this->getConfigInstance()->getConfigEntry('default_console_command');
 
 		// Check if command is valid
-		if ($this->isCommandValid($commandName) === false) {
+		if ($this->isCommandValid($commandName) === FALSE) {
 			// This command is invalid!
 			throw new InvalidCommandException(array($this, $commandName), self::EXCEPTION_INVALID_COMMAND);
 		} // END - if
@@ -107,7 +102,7 @@ class HubConsoleCommandResolver extends BaseCommandResolver implements CommandRe
 		} // END - if
 
 		// Set last command
-		$this->lastCommandInstance = $commandInstance;
+		$this->setResolvedInstance($commandInstance);
 
 		// Return the resolved command instance
 		return $commandInstance;
@@ -122,13 +117,13 @@ class HubConsoleCommandResolver extends BaseCommandResolver implements CommandRe
 	 */
 	public function resolveCommand ($commandName) {
 		// Initiate the instance variable
-		$commandInstance = null;
+		$commandInstance = NULL;
 
 		// Is the command empty? Then fall back to default command
 		if (empty($commandName)) $commandName = $this->getConfigInstance()->getConfigEntry('default_console_command');
 
 		// Check if command is valid
-		if ($this->isCommandValid($commandName) === false) {
+		if ($this->isCommandValid($commandName) === FALSE) {
 			// This command is invalid!
 			throw new InvalidCommandException(array($this, $commandName), self::EXCEPTION_INVALID_COMMAND);
 		}
@@ -150,7 +145,7 @@ class HubConsoleCommandResolver extends BaseCommandResolver implements CommandRe
 	 */
 	private function loadCommand ($commandName) {
 		// Init command instance
-		$commandInstance = null;
+		$commandInstance = NULL;
 
 		// Create class name
 		$className = 'HubConsole' . $this->convertToClassName($commandName) . 'Command';