X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Ffactories%2Fobjects%2Fclass_ObjectFactory.php;h=e453d9e8dd074443b358bf8c0c62e30174dadbb5;hb=adcdfc000eba8fac128786adcb8cb480085e7e76;hp=f06a70a16b6a82a4ff32738853114b89ffdbb4b9;hpb=b002c5909aa0f781505dde5414964b0f014cde01;p=core.git

diff --git a/framework/main/classes/factories/objects/class_ObjectFactory.php b/framework/main/classes/factories/objects/class_ObjectFactory.php
index f06a70a1..e453d9e8 100644
--- a/framework/main/classes/factories/objects/class_ObjectFactory.php
+++ b/framework/main/classes/factories/objects/class_ObjectFactory.php
@@ -14,7 +14,7 @@ use \InvalidArgumentException;
  *
  * @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 - 2020 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *
@@ -35,12 +35,12 @@ class ObjectFactory extends BaseFactory {
 	/**
 	 * Protected constructor
 	 *
-	 * @param	$className	Name of this class
+	 * @param	$fullClassName	Name of this class
 	 * @return	void
 	 */
-	protected function __construct ($className = __CLASS__) {
+	protected function __construct ($fullClassName = __CLASS__) {
 		// Call parent constructor
-		parent::__construct($className);
+		parent::__construct($fullClassName);
 	}
 
 	/**
@@ -48,39 +48,42 @@ class ObjectFactory extends BaseFactory {
 	 * the class was not found. No parameters for the object are currently
 	 * supported.
 	 *
-	 * @param	$className			Name of the class we shall construct
+	 * @param	$fullClassName			Name of the class we shall construct
 	 * @param	$args				Arguments in an indexed array
 	 * @return	$objectInstance		An instance of the requested object
 	 * @throws	NoClassException	If the requested class was not found
 	 * @throws	InvalidArgumentException	If className is empty or the name not following naming-convention
 	 */
-	public static final function createObjectByName ($className, array $args = array()) {
-		// First get an instance of this factory
-		$factoryInstance = new ObjectFactory();
-
-		// Split class name on backslash to check naming-convention
-		$classNameParts = explode("\\", $className);
-
+	public static final function createObjectByName ($fullClassName, array $args = array()) {
 		// Is the class name valid and is the class there?
-		if (empty($className)) {
+		if (empty($fullClassName)) {
 			// Throw an exception here
 			throw new InvalidArgumentException('Parameter "className" is empty');
-		} elseif (!class_exists($className)) {
+		} elseif (!class_exists($fullClassName)) {
+			// First get an instance of this factory
+			$factoryInstance = new ObjectFactory();
+
 			// Then throw an exception
-			throw new NoClassException(array($factoryInstance, $className), self::EXCEPTION_CLASS_NOT_FOUND);
-		} elseif (count($classNameParts) < 3) {
-			// Namespaces are missing
-			throw new InvalidArgumentException(sprintf('Class name "%s" is not conform to naming-convention: Tld\Domain\Project\Package[\SubPackage...]\SomeFooBar', $className));
+			throw new NoClassException(array($factoryInstance, $fullClassName), self::EXCEPTION_CLASS_NOT_FOUND);
 		}
 
+		// Split class name on backslash to check naming-convention
+		$classNameParts = explode("\\", $fullClassName);
+
+		// Okay, does it follow naming-convention?
+		if (count($classNameParts) < 4) {
+			// Namespaces are missing
+			throw new InvalidArgumentException(sprintf('Class name "%s" is not conform to naming-convention: Tld\Domain\Project\Package[\SubPackage...]\SomeFooBar', $fullClassName));
+		} // END - if
+
 		// Create method name
-		$methodName = sprintf('create%s', self::stripNamespaceFromClassName($className));
+		$methodName = sprintf('create%s', self::stripNamespaceFromClassName($fullClassName));
 
 		// Run the user function
-		$objectInstance = call_user_func_array(array($className, $methodName), $args);
+		$objectInstance = call_user_func_array(array($fullClassName, $methodName), $args);
 
 		// Count this one up
-		self::countObject($className);
+		self::countObject($fullClassName);
 
 		// Return the prepared instance
 		return $objectInstance;
@@ -95,10 +98,10 @@ class ObjectFactory extends BaseFactory {
 	 */
 	public static final function createObjectByConfiguredName ($configEntry, array $args = array()) {
 		// Read the configuration entry
-		$className = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry($configEntry);
+		$fullClassName = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry($configEntry);
 
 		// Send this to the other factory...
-		$objectInstance = self::createObjectByName($className, $args);
+		$objectInstance = self::createObjectByName($fullClassName, $args);
 
 		// Return the instance
 		return $objectInstance;
@@ -111,18 +114,11 @@ class ObjectFactory extends BaseFactory {
 	 *
 	 * @param	$fullClassName	Class name with namespace
 	 * @return	$shortClassName	Stripped class name (no namespace)
-	 * @throws	InvalidClassNameException	If the class name does not follow naming convention
 	 */
 	private static function stripNamespaceFromClassName ($fullClassName) {
 		// The class name should contain at least 2 back-slashes, so split at them
 		$classNameParts = explode("\\", $fullClassName);
 
-		// At least 3 parts should be there
-		if (count($classNameParts) < 3) {
-			// Namespace scheme is: Project\Package[\SubPackage...]
-			throw new InvalidClassNameException($fullClassName, self::EXCEPTION_INVALID_CLASS_NAME);
-		} // END - if
-
 		// Get last element
 		$shortClassName = array_pop($classNameParts);