From: Roland Haeder <roland@mxchange.org>
Date: Tue, 24 Mar 2015 19:53:09 +0000 (+0100)
Subject: Moved methods to reduce code duplicates.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=00f71f79dde86aa012b897bb9094f01fadf855d3;p=core.git

Moved methods to reduce code duplicates.

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

diff --git a/inc/classes/main/resolver/command/class_BaseCommandResolver.php b/inc/classes/main/resolver/command/class_BaseCommandResolver.php
index 4d027b37..0994bf16 100644
--- a/inc/classes/main/resolver/command/class_BaseCommandResolver.php
+++ b/inc/classes/main/resolver/command/class_BaseCommandResolver.php
@@ -57,6 +57,112 @@ class BaseCommandResolver extends BaseResolver {
 		return $this->commandName;
 	}
 
+	/**
+	 * "Loads" a given command and instances it if not yet cached
+	 *
+	 * @param	$commandName				A command name we shall look for
+	 * @return	$commandInstance			A loaded command instance
+	 * @throws	InvalidCommandException		Thrown if even the default
+	 *										command class is missing (bad!)
+	 */
+	protected function loadCommand ($commandName) {
+		// Init command instance
+		$commandInstance = NULL;
+
+		// Create class name
+		$className = $this->getCapitalizedClassPrefix() . $this->convertToClassName($commandName) . 'Command';
+
+		// Create command class name
+		$this->setClassName($className);
+
+		// Is this class loaded?
+		if (!class_exists($this->getClassName())) {
+			// Class not found, so throw an exception
+			throw new InvalidCommandException(array($this, $commandName), self::EXCEPTION_INVALID_COMMAND);
+		} // END - if
+
+		// Initiate the command
+		$commandInstance = ObjectFactory::createObjectByName($this->getClassName(), array($this));
+
+		// Return the result
+		return $commandInstance;
+	}
+
+	/**
+	 * Returns an command instance for a given request class or null if
+	 * it was not found
+	 *
+	 * @param	$requestInstance	An instance of a request class
+	 * @return	$commandInstance	An instance of the resolved command
+	 * @throws	InvalidCommandException				Thrown if $commandName is
+	 *												invalid
+	 * @throws	InvalidCommandInstanceException		Thrown if $commandInstance
+	 *												is an invalid instance
+	 */
+	public function resolveCommandByRequest (Requestable $requestInstance) {
+		// Init variables
+		$commandName = '';
+		$commandInstance = NULL;
+
+		// This goes fine so let's resolve the command
+		$commandName = $requestInstance->getRequestElement('command');
+
+		// Is the command empty? Then fall back to default command
+		if (empty($commandName)) {
+			$commandName = $this->getConfigInstance()->getConfigEntry('default_html_command');
+		} // END - if
+
+		// Check if command is valid
+		if ($this->isCommandValid($commandName) === FALSE) {
+			// This command is invalid!
+			throw new InvalidCommandException(array($this, $commandName), self::EXCEPTION_INVALID_COMMAND);
+		} // END - if
+
+		// Get the command
+		$commandInstance = $this->loadCommand($commandName);
+
+		// And validate it
+		if ((!is_object($commandInstance)) || (!$commandInstance instanceof Commandable)) {
+			// This command has an invalid instance!
+			throw new InvalidCommandInstanceException(array($this, $commandName), self::EXCEPTION_INVALID_COMMAND);
+		} // END - if
+
+		// Set last command
+		$this->setResolvedInstance($commandInstance);
+
+		// Return the resolved command instance
+		return $commandInstance;
+	}
+
+	/**
+	 * Resolves the command by its direct name and returns an instance of its class
+	 *
+	 * @param	$commandName		The direct command name we shall resolve
+	 * @return	$commandInstance	An instance of the command class
+	 * @throws	InvalidCommandException		Thrown if $commandName is invalid
+	 */
+	public function resolveCommand ($commandName) {
+		// Initiate the instance variable
+		$commandInstance = NULL;
+
+		// Is the command empty? Then fall back to default command
+		if (empty($commandName)) {
+			$commandName = $this->getConfigInstance()->getConfigEntry('default_html_command');
+		} // END - if
+
+		// Check if command is valid
+		if ($this->isCommandValid($commandName) === FALSE) {
+			// This command is invalid!
+			throw new InvalidCommandException(array($this, $commandName), self::EXCEPTION_INVALID_COMMAND);
+		} // END - if
+
+		// Get the command
+		$commandInstance = $this->loadCommand($commandName);
+
+		// Return the instance
+		return $commandInstance;
+	}
+
 	/**
 	 * Checks whether the given command is valid
 	 *
diff --git a/inc/classes/main/resolver/command/console/class_ConsoleCommandResolver.php b/inc/classes/main/resolver/command/console/class_ConsoleCommandResolver.php
index 87c3c8c6..2b1582c8 100644
--- a/inc/classes/main/resolver/command/console/class_ConsoleCommandResolver.php
+++ b/inc/classes/main/resolver/command/console/class_ConsoleCommandResolver.php
@@ -63,112 +63,6 @@ class ConsoleCommandResolver extends BaseCommandResolver implements CommandResol
 		// Return the prepared instance
 		return $resolverInstance;
 	}
-
-	/**
-	 * Returns an command instance for a given request class or null if
-	 * it was not found
-	 *
-	 * @param	$requestInstance	An instance of a request class
-	 * @return	$commandInstance	An instance of the resolved command
-	 * @throws	InvalidCommandException				Thrown if $commandName is
-	 *												invalid
-	 * @throws	InvalidCommandInstanceException		Thrown if $commandInstance
-	 *												is an invalid instance
-	 */
-	public function resolveCommandByRequest (Requestable $requestInstance) {
-		// Init variables
-		$commandName = '';
-		$commandInstance = NULL;
-
-		// This goes fine so let's resolve the command
-		$commandName = $requestInstance->getRequestElement('command');
-
-		// Is the command empty? Then fall back to default command
-		if (empty($commandName)) {
-			$commandName = $this->getConfigInstance()->getConfigEntry('default_console_command');
-		} // END - if
-
-		// Check if command is valid
-		if ($this->isCommandValid($commandName) === FALSE) {
-			// This command is invalid!
-			throw new InvalidCommandException(array($this, $commandName), self::EXCEPTION_INVALID_COMMAND);
-		} // END - if
-
-		// Get the command
-		$commandInstance = $this->loadCommand($commandName);
-
-		// And validate it
-		if ((!is_object($commandInstance)) || (!$commandInstance instanceof Commandable)) {
-			// This command has an invalid instance!
-			throw new InvalidCommandInstanceException(array($this, $commandName), self::EXCEPTION_INVALID_COMMAND);
-		} // END - if
-
-		// Set last command
-		$this->setResolvedInstance($commandInstance);
-
-		// Return the resolved command instance
-		return $commandInstance;
-	}
-
-	/**
-	 * Resolves the command by its direct name and returns an instance of its class
-	 *
-	 * @param	$commandName		The direct command name we shall resolve
-	 * @return	$commandInstance	An instance of the command class
-	 * @throws	InvalidCommandException		Thrown if $commandName is invalid
-	 */
-	public function resolveCommand ($commandName) {
-		// Initiate the instance variable
-		$commandInstance = NULL;
-
-		// Is the command empty? Then fall back to default command
-		if (empty($commandName)) {
-			$commandName = $this->getConfigInstance()->getConfigEntry('default_console_command');
-		} // END - if
-
-		// Check if command is valid
-		if ($this->isCommandValid($commandName) === FALSE) {
-			// This command is invalid!
-			throw new InvalidCommandException(array($this, $commandName), self::EXCEPTION_INVALID_COMMAND);
-		} // END - if
-
-		// Get the command
-		$commandInstance = $this->loadCommand($commandName);
-
-		// Return the instance
-		return $commandInstance;
-	}
-
-	/**
-	 * "Loads" a given command and instances it if not yet cached
-	 *
-	 * @param	$commandName				A command name we shall look for
-	 * @return	$commandInstance			A loaded command instance
-	 * @throws	InvalidCommandException		Thrown if even the default
-	 *										command class is missing (bad!)
-	 */
-	private function loadCommand ($commandName) {
-		// Init command instance
-		$commandInstance = NULL;
-
-		// Create class name
-		$className = $this->getCapitalizedClassPrefix() . $this->convertToClassName($commandName) . 'Command';
-
-		// Create command class name
-		$this->setClassName($className);
-
-		// Is this class loaded?
-		if (!class_exists($this->getClassName())) {
-			// Class not found, so throw an exception
-			throw new InvalidCommandException(array($this, $commandName), self::EXCEPTION_INVALID_COMMAND);
-		} // END - if
-
-		// Initiate the command
-		$commandInstance = ObjectFactory::createObjectByName($this->getClassName(), array($this));
-
-		// Return the result
-		return $commandInstance;
-	}
 }
 
 // [EOF]
diff --git a/inc/classes/main/resolver/command/image/class_ImageCommandResolver.php b/inc/classes/main/resolver/command/image/class_ImageCommandResolver.php
index b0fc8be6..80a84dc9 100644
--- a/inc/classes/main/resolver/command/image/class_ImageCommandResolver.php
+++ b/inc/classes/main/resolver/command/image/class_ImageCommandResolver.php
@@ -37,7 +37,7 @@ class ImageCommandResolver extends BaseCommandResolver implements CommandResolve
 		parent::__construct(__CLASS__);
 
 		// Set prefix to "Image"
-		$this->setClassPrefix('Image');
+		$this->setClassPrefix('image');
 	}
 
 	/**
@@ -68,109 +68,6 @@ class ImageCommandResolver extends BaseCommandResolver implements CommandResolve
 		// Return the prepared instance
 		return $resolverInstance;
 	}
-
-	/**
-	 * Returns an command instance for a given request class or null if
-	 * it was not found
-	 *
-	 * @param	$requestInstance	An instance of a request class
-	 * @return	$commandInstance	An instance of the resolved command
-	 * @throws	InvalidCommandException				Thrown if $commandName is
-	 *												invalid
-	 * @throws	InvalidCommandInstanceException		Thrown if $commandInstance
-	 *												is an invalid instance
-	 */
-	public function resolveCommandByRequest (Requestable $requestInstance) {
-		// Init variables
-		$commandName = '';
-		$commandInstance = NULL;
-
-		// This goes fine so let's resolve the command
-		$commandName = $requestInstance->getRequestElement('page');
-
-		// Is the command empty? Then fall back to default command
-		if (empty($commandName)) {
-			$commandName = $this->getConfigInstance()->getConfigEntry('default_image_command');
-		} // END - if
-
-		// Check if command is valid
-		if ($this->isCommandValid($commandName) === FALSE) {
-			// This command is invalid!
-			throw new InvalidCommandException(array($this, $commandName), self::EXCEPTION_INVALID_COMMAND);
-		} // END - if
-
-		// Get the command
-		$commandInstance = $this->loadCommand($commandName);
-
-		// And validate it
-		if ((!is_object($commandInstance)) || (!$commandInstance instanceof Commandable)) {
-			// This command has an invalid instance!
-			throw new InvalidCommandInstanceException(array($this, $commandName), self::EXCEPTION_INVALID_COMMAND);
-		} // END - if
-
-		// Set last command
-		$this->setResolvedInstance($commandInstance);
-
-		// Return the resolved command instance
-		return $commandInstance;
-	}
-
-	/**
-	 * Resolves the command by its direct name and returns an instance of its class
-	 *
-	 * @param	$commandName		The direct command name we shall resolve
-	 * @return	$commandInstance	An instance of the command class
-	 * @throws	InvalidCommandException		Thrown if $commandName is invalid
-	 */
-	public function resolveCommand ($commandName) {
-		// Initiate the instance variable
-		$commandInstance = NULL;
-
-		// Is the command empty? Then fall back to default command
-		if (empty($commandName)) {
-			$commandName = $this->getConfigInstance()->getConfigEntry('default_image_command');
-		} // END - if
-
-		// Check if command is valid
-		if ($this->isCommandValid($commandName) === FALSE) {
-			// This command is invalid!
-			throw new InvalidCommandException(array($this, $commandName), self::EXCEPTION_INVALID_COMMAND);
-		} // END - if
-
-		// Get the command
-		$commandInstance = $this->loadCommand($commandName);
-
-		// Return the instance
-		return $commandInstance;
-	}
-
-	/**
-	 * "Loads" a given command and instances it if not yet cached
-	 *
-	 * @param	$commandName				A command name we shall look for
-	 * @return	$commandInstance			A loaded command instance
-	 * @throws	InvalidCommandException		Thrown if even the default
-	 *										command class is missing (bad!)
-	 */
-	private function loadCommand ($commandName) {
-		// Init command instance
-		$commandInstance = NULL;
-
-		// Create class name
-		$className = $this->getCapitalizedClassPrefix() . $this->convertToClassName($commandName) . 'Command';
-
-		// Is this class loaded?
-		if (!class_exists($this->getClassName())) {
-			// Class not found, so throw an exception
-			throw new InvalidCommandException(array($this, $commandName), self::EXCEPTION_INVALID_COMMAND);
-		} // END - if
-
-		// Initiate the command
-		$commandInstance = ObjectFactory::createObjectByName($this->getClassName(), array($this));
-
-		// Return the result
-		return $commandInstance;
-	}
 }
 
 // [EOF]
diff --git a/inc/classes/main/resolver/command/web/class_ b/inc/classes/main/resolver/command/web/class_
index d96768ab..17bb3017 100644
--- a/inc/classes/main/resolver/command/web/class_
+++ b/inc/classes/main/resolver/command/web/class_
@@ -68,110 +68,6 @@ class Web???CommandResolver extends BaseCommandResolver implements CommandResolv
 		// Return the prepared instance
 		return $resolverInstance;
 	}
-
-	/**
-	 * Returns an command instance for a given request class or null if
-	 * it was not found
-	 *
-	 * @param	$requestInstance	An instance of a request class
-	 * @return	$commandInstance	An instance of the resolved command
-	 * @throws	InvalidCommandException				Thrown if $commandName is
-	 *												invalid
-	 * @throws	InvalidCommandInstanceException		Thrown if $commandInstance
-	 *												is an invalid instance
-	 */
-	public function resolveCommandByRequest (Requestable $requestInstance) {
-		// Init variables
-		$commandName = "";
-		$commandInstance = null;
-
-		// This goes fine so let's resolv the command
-		$commandName = $requestInstance->getRequestElement('page');
-
-		// Is the command empty? Then fall back to default command
-		if (empty($commandName)) $commandName = $this->getConfigInstance()->getConfigEntry('default_html_command');
-
-		// Check if the command is valid
-		if ($this->isCommandValid($commandName) === FALSE) {
-			// This command is invalid!
-			throw new InvalidCommandException(array($this, $commandName), self::EXCEPTION_INVALID_COMMAND);
-		} // END - if
-
-		// Get the command
-		$commandInstance = $this->loadCommand($commandName);
-
-		// And validate it
-		if ((!is_object($commandInstance)) || (!$commandInstance instanceof Commandable)) {
-			// This command has an invalid instance!
-			throw new InvalidCommandInstanceException(array($this, $commandName), self::EXCEPTION_INVALID_COMMAND);
-		} // END - if
-
-		// Set last command
-		$this->lastCommandInstance = $commandInstance;
-
-		// Return the resolved command instance
-		return $commandInstance;
-	}
-
-	/**
-	 * Resolves the command by its direct name and returns an instance of its class
-	 *
-	 * @param	$commandName		The direct command name we shall resolve
-	 * @return	$commandInstance	An instance of the command class
-	 * @throws	InvalidCommandException		Thrown if $commandName is invalid
-	 */
-	public function resolveCommand ($commandName) {
-		// Initiate the instance variable
-		$commandInstance = null;
-
-		// Is the command empty? Then fall back to default command
-		if (empty($commandName)) $commandName = $this->getConfigInstance()->getConfigEntry('default_html_command');
-
-		// Check if the command is valid
-		if ($this->isCommandValid($commandName) === FALSE) {
-			// This command is invalid!
-			throw new InvalidCommandException(array($this, $commandName), self::EXCEPTION_INVALID_COMMAND);
-		}
-
-		// Get the command
-		$commandInstance = $this->loadCommand($commandName);
-
-		// Return the instance
-		return $commandInstance;
-	}
-
-	/**
-	 * "Loads" a given command and instances it if not yet cached
-	 *
-	 * @param	$commandName				A command name we shall look for
-	 * @return	$commandInstance			A loaded command instance
-	 * @throws	InvalidCommandException		Thrown if even the default
-	 *										command class is missing (bad!)
-	 */
-	private function loadCommand ($commandName) {
-		// Cache default command
-		$defaultCommand = $this->getConfigInstance()->getConfigEntry('default_html_command');
-
-		// Init command instance
-		$commandInstance = null;
-
-		// Create command class name
-		$this->setClassName(sprintf("Web%sCommand",
-			$this->convertToClassName($commandName)
-		));
-
-		// Is this class loaded?
-		if (!class_exists($this->getClassName())) {
-			// Class not found, so throw an exception
-			throw new InvalidCommandException(array($this, $defaultCommand), self::EXCEPTION_INVALID_COMMAND);
-		} // END - if
-
-		// Initiate the command
-		$commandInstance = ObjectFactory::createObjectByName($this->getClassName(), array($this));
-
-		// Return the result
-		return $commandInstance;
-	}
 }
 
 // [EOF]
diff --git a/inc/classes/main/resolver/command/web/class_WebCommandResolver.php b/inc/classes/main/resolver/command/web/class_WebCommandResolver.php
index 9225c454..146a2e5f 100644
--- a/inc/classes/main/resolver/command/web/class_WebCommandResolver.php
+++ b/inc/classes/main/resolver/command/web/class_WebCommandResolver.php
@@ -68,106 +68,6 @@ class WebCommandResolver extends BaseCommandResolver implements CommandResolver
 		// Return the prepared instance
 		return $resolverInstance;
 	}
-
-	/**
-	 * Returns an command instance for a given request class or null if
-	 * it was not found
-	 *
-	 * @param	$requestInstance	An instance of a request class
-	 * @return	$commandInstance	An instance of the resolved command
-	 * @throws	InvalidCommandException				Thrown if $commandName is
-	 *												invalid
-	 * @throws	InvalidCommandInstanceException		Thrown if $commandInstance
-	 *												is an invalid instance
-	 */
-	public function resolveCommandByRequest (Requestable $requestInstance) {
-		// Init variables
-		$commandName = '';
-		$commandInstance = NULL;
-
-		// This goes fine so let's resolve the command
-		$commandName = $requestInstance->getRequestElement('page');
-
-		// Is the command empty? Then fall back to default command
-		if (empty($commandName)) {
-			$commandName = $this->getConfigInstance()->getConfigEntry('default_html_command');
-		} // END - if
-
-		// Check if command is valid
-		if ($this->isCommandValid($commandName) === FALSE) {
-			// This command is invalid!
-			throw new InvalidCommandException(array($this, $commandName), self::EXCEPTION_INVALID_COMMAND);
-		} // END - if
-
-		// Get the command
-		$commandInstance = $this->loadCommand($commandName);
-
-		// And validate it
-		if ((!is_object($commandInstance)) || (!$commandInstance instanceof Commandable)) {
-			// This command has an invalid instance!
-			throw new InvalidCommandInstanceException(array($this, $commandName), self::EXCEPTION_INVALID_COMMAND);
-		} // END - if
-
-		// Set last command
-		$this->setResolvedInstance($commandInstance);
-
-		// Return the resolved command instance
-		return $commandInstance;
-	}
-
-	/**
-	 * Resolves the command by its direct name and returns an instance of its class
-	 *
-	 * @param	$commandName		The direct command name we shall resolve
-	 * @return	$commandInstance	An instance of the command class
-	 * @throws	InvalidCommandException		Thrown if $commandName is invalid
-	 */
-	public function resolveCommand ($commandName) {
-		// Initiate the instance variable
-		$commandInstance = NULL;
-
-		// Is the command empty? Then fall back to default command
-		if (empty($commandName)) {
-			$commandName = $this->getConfigInstance()->getConfigEntry('default_html_command');
-		} // END - if
-
-		// Check if command is valid
-		if ($this->isCommandValid($commandName) === FALSE) {
-			// This command is invalid!
-			throw new InvalidCommandException(array($this, $commandName), self::EXCEPTION_INVALID_COMMAND);
-		} // END - if
-
-		// Get the command
-		$commandInstance = $this->loadCommand($commandName);
-
-		// Return the instance
-		return $commandInstance;
-	}
-
-	/**
-	 * "Loads" a given command and instances it if not yet cached
-	 *
-	 * @param	$commandName				A command name we shall look for
-	 * @return	$commandInstance			A loaded command instance
-	 * @throws	InvalidCommandException		Thrown if even the default
-	 *										command class is missing (bad!)
-	 */
-	private function loadCommand ($commandName) {
-		// Init command instance
-		$commandInstance = NULL;
-
-		// Is this class loaded?
-		if (!class_exists($this->getClassName())) {
-			// Class not found, so throw an exception
-			throw new InvalidCommandException(array($this, $commandName), self::EXCEPTION_INVALID_COMMAND);
-		} // END - if
-
-		// Initiate the command
-		$commandInstance = ObjectFactory::createObjectByName($this->getClassName(), array($this));
-
-		// Return the result
-		return $commandInstance;
-	}
 }
 
 // [EOF]