X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fclass_BaseFrameworkSystem.php;h=79a60abeb3d09d1622ad580dfb3acf70541c9191;hp=fed352a4cfb4e371a635529a59b74540a52cac05;hb=42842656e56e030851edf8a3546d2eef995c3b24;hpb=1962cae56d2193733b702a02b0412bcc8364e003

diff --git a/inc/classes/main/class_BaseFrameworkSystem.php b/inc/classes/main/class_BaseFrameworkSystem.php
index fed352a4..79a60abe 100644
--- a/inc/classes/main/class_BaseFrameworkSystem.php
+++ b/inc/classes/main/class_BaseFrameworkSystem.php
@@ -361,8 +361,15 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 		} elseif (is_array($args)) {
 			// Some arguments are there
 			foreach ($args as $arg) {
-				// Add the type
-				$argsString .= $this->replaceControlCharacters($arg) . ' (' . gettype($arg);
+				// Add the value itself if not array. This prevents 'array to string conversion' message
+				if (is_array($arg)) {
+					$argsString .= 'Array';
+				} else {
+					$argsString .= $arg;
+				}
+
+				// Add data about the argument
+				$argsString .= ' (' . gettype($arg);
 
 				if (is_string($arg)) {
 					// Add length for strings
@@ -726,11 +733,11 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	}
 
 	/**
-	 * Checks wether an object equals this object. You should overwrite this
+	 * Checks whether an object equals this object. You should overwrite this
 	 * method to implement own equality checks
 	 *
 	 * @param	$objectInstance		An instance of a FrameworkInterface object
-	 * @return	$equals				Wether both objects equals
+	 * @return	$equals				Whether both objects equals
 	 */
 	public function equals (FrameworkInterface $objectInstance) {
 		// Now test it
@@ -982,10 +989,10 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	}
 
 	/**
-	 * Outputs a debug message wether to debug instance (should be set!) or dies with or pints the message
+	 * Outputs a debug message whether to debug instance (should be set!) or dies with or pints the message
 	 *
 	 * @param	$message	Message we shall send out...
-	 * @param	$doPrint	Wether we shall print or die here which first is the default
+	 * @param	$doPrint	Whether we shall print or die here which first is the default
 	 * @return	void
 	 */
 	public function debugOutput ($message, $doPrint = true) {
@@ -1311,10 +1318,10 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	}
 
 	/**
-	 * Checks wether the given PHP extension is loaded
+	 * Checks whether the given PHP extension is loaded
 	 *
 	 * @param	$phpExtension	The PHP extension we shall check
-	 * @return	$isLoaded	Wether the PHP extension is loaded
+	 * @return	$isLoaded	Whether the PHP extension is loaded
 	 */
 	public final function isPhpExtensionLoaded ($phpExtension) {
 		// Is it loaded?
@@ -1398,7 +1405,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	/**
 	 * Idles (sleeps) for given milliseconds
 	 *
-	 * @return	$hasSlept	Wether it goes fine
+	 * @return	$hasSlept	Whether it goes fine
 	 */
 	public function idle ($milliSeconds) {
 		// Sleep is fine by default
@@ -1899,10 +1906,10 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	}
 
 	/**
-	 * Checks wether the given encoded data was encoded with Base64
+	 * Checks whether the given encoded data was encoded with Base64
 	 *
 	 * @param	$encodedData	Encoded data we shall check
-	 * @return	$isBase64		Wether the encoded data is Base64
+	 * @return	$isBase64		Whether the encoded data is Base64
 	 */
 	protected function isBase64Encoded ($encodedData) {
 		// Determine it
@@ -1938,7 +1945,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	 * @param	$onlyKeys			Only use these keys for a cache key
 	 * @return	$cacheKey			A cache key suitable for lookup/storage purposes
 	 */
-	protected function getCacheKeyByCriteria (Criteria $criteriaInstance, $onlyKeys = array()) {
+	protected function getCacheKeyByCriteria (Criteria $criteriaInstance, array $onlyKeys = array()) {
 		// Generate it
 		$cacheKey = sprintf("%s@%s",
 			$this->__toString(),
@@ -2010,7 +2017,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 		// Assert only if requested
 		if ($assertMismatch === true) {
 			// Has the whole value changed?
-			assert(($assertMismatch === true)('' . $ret . '' != '' . $num . '') && (!is_null($num)));
+			assert(('' . $ret . '' != '' . $num . '') && (!is_null($num)));
 		} // END - if
 
 		// Return result