X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Ffeature%2Fclass_FrameworkFeature.php;h=4f4bfa4e928576559cbd24860e2ffee75b3e1452;hb=HEAD;hp=0f67a15be50cb0c1a15dfdb12126d6ad73f824de;hpb=08a0c865dd2c8ee0b6dbf96f4f07e9ee0ce0f02b;p=core.git

diff --git a/framework/main/classes/feature/class_FrameworkFeature.php b/framework/main/classes/feature/class_FrameworkFeature.php
index 0f67a15b..3d2fbeb7 100644
--- a/framework/main/classes/feature/class_FrameworkFeature.php
+++ b/framework/main/classes/feature/class_FrameworkFeature.php
@@ -5,17 +5,22 @@ namespace Org\Mxchange\CoreFramework\Feature;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
+use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
 use Org\Mxchange\CoreFramework\Loader\NoClassException;
 use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
 use Org\Mxchange\CoreFramework\Utils\Strings\StringUtils;
 
+// Import SPL stuff
+use \BadMethodCallException;
+use \InvalidArgumentException;
+
 /**
  * The general feature management class. No instance is needed as this class
  * has only public methods that are static.
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2021 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.ship-simu.org
  *
@@ -73,8 +78,16 @@ class FrameworkFeature extends BaseFrameworkSystem {
 	 *
 	 * @param	$featureName	Name of the feature to be checked
 	 * @return	$isEnabled		Whether the given feature is enabled
+	 * @throws	InvalidArgumentException	If a parameter is invalid
 	 */
-	public static function isFeatureEnabled ($featureName) {
+	public static function isFeatureEnabled (string $featureName) {
+		// Check parameter
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('FRAMEWORK-FEATURE: featureName=%s - CALLED!', $featureName));
+		if (empty($featureName)) {
+			// Throw IAE
+			throw new InvalidArgumentException('Parameter "featureName" is empty', FrameworkInterface::EXCEPTION_INVALID_ARGUMENT);
+		}
+
 		// Is the cache set?
 		if (!isset(self::$enabledFeatures[$featureName]['is_enabled'])) {
 			// Generate config key
@@ -85,6 +98,7 @@ class FrameworkFeature extends BaseFrameworkSystem {
 		}
 
 		// Return "cached" status
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('FRAMEWORK-FEATURE: is_enabled[%s]=%d - EXIT!', $featureName, intval(self::$enabledFeatures[$featureName]['is_enabled'])));
 		return self::$enabledFeatures[$featureName]['is_enabled'];
 	}
 
@@ -97,10 +111,17 @@ class FrameworkFeature extends BaseFrameworkSystem {
 	 *
 	 * @param	$featureName	Name of the feature to be checked on availability
 	 * @return	$isAvailable	Whether the given feature is available
+	 * @throws	InvalidArgumentException	If a parameter is invalid
 	 */
-	public static function isFeatureAvailable ($featureName) {
+	public static function isFeatureAvailable (string $featureName) {
+		// Check parameter
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('FRAMEWORK-FEATURE: featureName=%s - CALLED!', $featureName));
+		if (empty($featureName)) {
+			// Throw IAE
+			throw new InvalidArgumentException('Parameter "featureName" is empty', FrameworkInterface::EXCEPTION_INVALID_ARGUMENT);
+		}
+
 		// Is the cache set?
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('FRAMEWORK-FEATURE: featureName=%s - CALLED!', $featureName));
 		if (!isset(self::$enabledFeatures[$featureName]['is_available'])) {
 			// Default is not available
 			self::$enabledFeatures[$featureName]['is_available'] = false;
@@ -109,7 +130,7 @@ class FrameworkFeature extends BaseFrameworkSystem {
 			// Is the feature enabled?
 			if (!self::isFeatureEnabled($featureName)) {
 				// Then it can't be available
-				self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('FRAMEWORK-FEATURE: Feature "%s"is not enabled.', $featureName));
+				//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('FRAMEWORK-FEATURE: Feature "%s"is not enabled. - EXIT!', $featureName));
 				return false;
 			}
 
@@ -117,7 +138,7 @@ class FrameworkFeature extends BaseFrameworkSystem {
 			$configKey = sprintf('feature_%s_class', $featureName);
 
 			// Now try to get the instance
-			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('FRAMEWORK-FEATURE: configKey=%s', $configKey));
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage(sprintf('FRAMEWORK-FEATURE: configKey=%s', $configKey));
 			try {
 				// Try to get an instance
 				self::$enabledFeatures[$featureName]['instance'] = ObjectFactory::createObjectByConfiguredName($configKey);
@@ -126,12 +147,12 @@ class FrameworkFeature extends BaseFrameworkSystem {
 				self::$enabledFeatures[$featureName]['is_available'] = self::$enabledFeatures[$featureName]['instance']->isFeatureAvailable();
 			} catch (NoClassException $e) {
 				// Feature class not found
-				self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('FRAMEWORK-FEATURE: Feature "%s"is not available due to missing feature class. Disabling feature ...', $featureName));
+				self::createDebugInstance(__CLASS__, __LINE__)->warningMessage(sprintf('FRAMEWORK-FEATURE: Feature "%s"is not available due to missing feature class. Disabling feature ...', $featureName));
 			}
 		}
 
 		// Return "cached" status
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('FRAMEWORK-FEATURE: featureName=%s,isAvailable=%d - EXIT!', $featureName, intval(self::$enabledFeatures[$featureName]['is_available'])));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('FRAMEWORK-FEATURE: featureName=%s,isAvailable=%d - EXIT!', $featureName, intval(self::$enabledFeatures[$featureName]['is_available'])));
 		return self::$enabledFeatures[$featureName]['is_available'];
 	}
 
@@ -144,15 +165,23 @@ class FrameworkFeature extends BaseFrameworkSystem {
 	 * @param	$featureMethod	Method name of the feature's class
 	 * @param	$args			Any arguments that should be handled over
 	 * @return	$return			Anything the feature's method has returned
+	 * @throws	InvalidArgumentException	If a parameter has an invalid value
+	 * @throws	BadMethodCallException	If this method has been invoked but the feature isn't available
 	 * @throws	FeatureMethodNotCallableException	If the requested method cannot be called
 	 */
-	public static function callFeature ($featureName, $featureMethod, array $args = NULL) {
-		/*
-		 * Please make sure that isFeatureAvailable() has been called and it has
-		 * returned true before calling this method.
-		 */
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('FRAMEWORK-FEATURE: featureName=%s,featureMethod=%s,args[]=%s - CALLED!', $featureName, $featureMethod, gettype($args)));
-		assert(self::isFeatureAvailable($featureName));
+	public static function callFeature (string $featureName, string $featureMethod, array $args = NULL) {
+		// Check parameter
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('FRAMEWORK-FEATURE: featureName=%s,featureMethod=%s,args[]=%s - CALLED!', $featureName, $featureMethod, gettype($args)));
+		if (empty($featureName)) {
+			// Throw IAE
+			throw new InvalidArgumentException('Parameter "featureName" is empty', FrameworkInterface::EXCEPTION_INVALID_ARGUMENT);
+		} elseif (empty($featureMethod)) {
+			// Throw IAE
+			throw new InvalidArgumentException('Parameter "featureMethod" is empty', FrameworkInterface::EXCEPTION_INVALID_ARGUMENT);
+		} elseif (!self::isFeatureAvailable($featureName)) {
+			// Throw BMCE
+			throw new BadMethodCallException(sprintf('Feature "%s" is not available but method "%s" should be invoked.', $featureName, $featureMethod), FrameworkInterface::EXCEPTION_BAD_METHOD_CALL);
+		}
 
 		// Array for call-back
 		$callable = array(
@@ -170,7 +199,7 @@ class FrameworkFeature extends BaseFrameworkSystem {
 		$return = call_user_func_array($callable, $args);
 
 		// Return any returned value
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('FRAMEWORK-FEATURE: return[]=%s - EXIT!', gettype($return)));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('FRAMEWORK-FEATURE: return[]=%s - EXIT!', gettype($return)));
 		return $return;
 	}