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

diff --git a/framework/main/classes/factories/objects/class_ObjectFactory.php b/framework/main/classes/factories/objects/class_ObjectFactory.php
index c0c4552d..e100dc69 100644
--- a/framework/main/classes/factories/objects/class_ObjectFactory.php
+++ b/framework/main/classes/factories/objects/class_ObjectFactory.php
@@ -1,9 +1,11 @@
 <?php
 // Own namespace
-namespace Org\Mxchange\CoreFramework\Factory;
+namespace Org\Mxchange\CoreFramework\Factory\Object;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
+use Org\Mxchange\CoreFramework\Factory\BaseFactory;
+use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
 use Org\Mxchange\CoreFramework\Loader\NoClassException;
 
 // Import SPL stuff
@@ -14,7 +16,7 @@ use \InvalidArgumentException;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2019 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
  *
@@ -35,12 +37,12 @@ class ObjectFactory extends BaseFactory {
 	/**
 	 * Protected constructor
 	 *
-	 * @param	$fullClassName	Name of this class
+	 * @param	$className	Name of this class
 	 * @return	void
 	 */
-	protected function __construct ($fullClassName = __CLASS__) {
+	protected function __construct (string $className = __CLASS__) {
 		// Call parent constructor
-		parent::__construct($fullClassName);
+		parent::__construct($className);
 	}
 
 	/**
@@ -48,23 +50,23 @@ class ObjectFactory extends BaseFactory {
 	 * the class was not found. No parameters for the object are currently
 	 * supported.
 	 *
-	 * @param	$fullClassName			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 ($fullClassName, array $args = array()) {
+	public static final function createObjectByName (string $fullClassName, array $args = []) {
 		// Is the class name valid and is the class there?
 		if (empty($fullClassName)) {
 			// Throw an exception here
-			throw new InvalidArgumentException('Parameter "className" is empty');
-		} elseif (!class_exists($fullClassName)) {
+			throw new InvalidArgumentException('Parameter "fullClassName" is empty', FrameworkInterface::EXCEPTION_INVALID_ARGUMENT);
+		} elseif (!self::isClassCounted($fullClassName) && !class_exists($fullClassName)) {
 			// First get an instance of this factory
 			$factoryInstance = new ObjectFactory();
 
 			// Then throw an exception
-			throw new NoClassException(array($factoryInstance, $fullClassName), self::EXCEPTION_CLASS_NOT_FOUND);
+			throw new NoClassException([$factoryInstance, $fullClassName], FrameworkInterface::EXCEPTION_CLASS_NOT_FOUND);
 		}
 
 		// Split class name on backslash to check naming-convention
@@ -74,13 +76,13 @@ class ObjectFactory extends BaseFactory {
 		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($fullClassName));
 
 		// Run the user function
-		$objectInstance = call_user_func_array(array($fullClassName, $methodName), $args);
+		$objectInstance = call_user_func_array([$fullClassName, $methodName], $args);
 
 		// Count this one up
 		self::countObject($fullClassName);
@@ -92,13 +94,13 @@ class ObjectFactory extends BaseFactory {
 	/**
 	 * Creates an object by it's configured name
 	 *
-	 * @param	$configEnttry		Configuration entry to read
+	 * @param	$configKey		Configuration key to read
 	 * @param	$args				Arguments in an indexed array
 	 * @return	$objectInstance		An instance of the requested object
 	 */
-	public static final function createObjectByConfiguredName ($configEntry, array $args = array()) {
+	public static final function createObjectByConfiguredName (string $configKey, array $args = []) {
 		// Read the configuration entry
-		$fullClassName = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry($configEntry);
+		$fullClassName = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry($configKey);
 
 		// Send this to the other factory...
 		$objectInstance = self::createObjectByName($fullClassName, $args);
@@ -115,7 +117,7 @@ class ObjectFactory extends BaseFactory {
 	 * @param	$fullClassName	Class name with namespace
 	 * @return	$shortClassName	Stripped class name (no namespace)
 	 */
-	private static function stripNamespaceFromClassName ($fullClassName) {
+	private static function stripNamespaceFromClassName (string $fullClassName) {
 		// The class name should contain at least 2 back-slashes, so split at them
 		$classNameParts = explode("\\", $fullClassName);