X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fmain%2Fclasses%2Fclass_BaseFrameworkSystem.php;h=4ad02eda4ed88e3e21542f8fd2cff71e5643c855;hp=8f42032ff98dcdfc3c624c4e67fdcbc075d9a311;hb=de1f271c2bdb43725f6671ea6588a44cf33bf091;hpb=46130e59d03880cc54ea2ddba9c660fe28d8a7d0

diff --git a/inc/main/classes/class_BaseFrameworkSystem.php b/inc/main/classes/class_BaseFrameworkSystem.php
index 8f42032f..4ad02eda 100644
--- a/inc/main/classes/class_BaseFrameworkSystem.php
+++ b/inc/main/classes/class_BaseFrameworkSystem.php
@@ -477,7 +477,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 			$this->setRealClass('DestructedObject');
 		} elseif ((defined('DEBUG_DESTRUCTOR')) && (is_object($this->getDebugInstance()))) {
 			// Already destructed object
-			self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:] The object <span class="object_name">%s</span> is already destroyed.',
+			self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:] The object <span class="object_name">%s</span> is already destroyed.',
 				__CLASS__,
 				$this->__toString()
 			));
@@ -567,7 +567,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 
 		// Output stub message
 		// @TODO __CLASS__ does always return BaseFrameworkSystem but not the extending (=child) class
-		self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[unknown::%s:] Stub! Args: %s',
+		self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[unknown::%s:] Stub! Args: %s',
 			$methodName,
 			$argsString
 		));
@@ -1201,7 +1201,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	 * @return	void
 	 */
 	public final function setSocketResource ($socketResource) {
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput($this->__toString() . '::' . __FUNCTION__ . ': socketResource=' . $socketResource . ',previous[' . gettype($this->socketResource) . ']=' . $this->socketResource);
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput($this->__toString() . '::' . __FUNCTION__ . ': socketResource=' . $socketResource . ',previous[' . gettype($this->socketResource) . ']=' . $this->socketResource);
 		$this->socketResource = $socketResource;
 	}
 
@@ -1211,7 +1211,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	 * @return	$socketResource		A valid socket resource
 	 */
 	public final function getSocketResource () {
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput($this->__toString() . '::' . __FUNCTION__ . ': socketResource[' . gettype($this->socketResource) . ']=' . $this->socketResource);
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput($this->__toString() . '::' . __FUNCTION__ . ': socketResource[' . gettype($this->socketResource) . ']=' . $this->socketResource);
 		return $this->socketResource;
 	}
 
@@ -1222,7 +1222,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	 * @return	void
 	 */
 	public final function setRegularExpression ($regularExpression) {
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput($this->__toString() . '::' . __FUNCTION__ . ': regularExpression=' . $regularExpression . ',previous[' . gettype($this->regularExpression) . ']=' . $this->regularExpression);
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput($this->__toString() . '::' . __FUNCTION__ . ': regularExpression=' . $regularExpression . ',previous[' . gettype($this->regularExpression) . ']=' . $this->regularExpression);
 		$this->regularExpression = $regularExpression;
 	}
 
@@ -1232,7 +1232,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	 * @return	$regularExpression	A valid regular expression
 	 */
 	public final function getRegularExpression () {
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput($this->__toString() . '::' . __FUNCTION__ . ': regularExpression[' . gettype($this->regularExpression) . ']=' . $this->regularExpression);
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput($this->__toString() . '::' . __FUNCTION__ . ': regularExpression[' . gettype($this->regularExpression) . ']=' . $this->regularExpression);
 		return $this->regularExpression;
 	}
 
@@ -1861,7 +1861,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 		// Debug instance is there?
 		if (!is_null($this->getDebugInstance())) {
 			// Output stub message
-			self::createDebugInstance(__CLASS__)->debugOutput($stubMessage);
+			self::createDebugInstance(__CLASS__, __LINE__)->debugOutput($stubMessage);
 		} else {
 			// Trigger an error
 			trigger_error($stubMessage);
@@ -1897,10 +1897,11 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	 * Creates an instance of a debugger instance
 	 *
 	 * @param	$className		Name of the class (currently unsupported)
+	 * @param	$lineNumber		Line number where the call was made
 	 * @return	$debugInstance	An instance of a debugger class
 	 * @deprecated	Not fully, as the new Logger facilities are not finished yet.
 	 */
-	public final static function createDebugInstance ($className) {
+	public final static function createDebugInstance ($className, $lineNumber = NULL) {
 		// Is the instance set?
 		if (!Registry::getRegistry()->instanceExists('debug')) {
 			// Init debug instance
@@ -1912,7 +1913,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 				$debugInstance = DebugMiddleware::createDebugMiddleware(FrameworkConfiguration::getSelfInstance()->getConfigEntry('debug_' . self::getResponseTypeFromSystem() . '_class'), $className);
 			} catch (NullPointerException $e) {
 				// Didn't work, no instance there
-				exit('Cannot create debugInstance! Exception=' . $e->__toString() . ', message=' . $e->getMessage());
+				exit(sprintf('Cannot create debugInstance! Exception=%s,message=%s,className=%s,lineNumber=%d' . PHP_EOL, $e->__toString(), $e->getMessage(), $className, $lineNumber));
 			}
 
 			// Empty string should be ignored and used for testing the middleware
@@ -2185,7 +2186,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 
 		// Get current array
 		$fieldArray = $resultInstance->current();
-		//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput($fieldName.':<pre>'.print_r($fieldArray, TRUE).'</pre>');
+		//* DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput($fieldName.':<pre>'.print_r($fieldArray, TRUE).'</pre>');
 
 		// Convert dashes to underscore
 		$fieldName2 = self::convertDashesToUnderscores($fieldName);
@@ -2196,10 +2197,10 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 			$fieldValue = $fieldArray[$fieldName2];
 		} elseif (defined('DEVELOPER')) {
 			// Missing field entry, may require debugging
-			self::createDebugInstance(__CLASS__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ']:fieldArray<pre>=' . print_r($fieldArray, TRUE) . '</pre>,fieldName=' . $fieldName . ' not found!');
+			self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ']:fieldArray<pre>=' . print_r($fieldArray, TRUE) . '</pre>,fieldName=' . $fieldName . ' not found!');
 		} else {
 			// Missing field entry, may require debugging
-			self::createDebugInstance(__CLASS__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ']:fieldName=' . $fieldName . ' not found!');
+			self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ']:fieldName=' . $fieldName . ' not found!');
 		}
 
 		// Return it
@@ -2225,7 +2226,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 
 		// Get current array
 		$fieldArray = $resultInstance->current();
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('[' . $this->__toString() . ':' . __LINE__ . '] fieldName=' . $fieldName . ',fieldArray=<pre>'.print_r($fieldArray, TRUE).'</pre>');
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('[' . $this->__toString() . ':' . __LINE__ . '] fieldName=' . $fieldName . ',fieldArray=<pre>'.print_r($fieldArray, TRUE).'</pre>');
 
 		// Convert dashes to underscore
 		$fieldName = self::convertDashesToUnderscores($fieldName);
@@ -2272,7 +2273,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 			// Debug instance is there?
 			if (!is_null($this->getDebugInstance())) {
 				// Output stub message
-				self::createDebugInstance(__CLASS__)->debugOutput($message);
+				self::createDebugInstance(__CLASS__, __LINE__)->debugOutput($message);
 			} else {
 				// Trigger an error
 				trigger_error($message . "<br />\n");
@@ -2460,7 +2461,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	 */
 	protected function hex2asc ($hex) {
 		// Check for length, it must be devideable by 2
-		//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('hex='.$hex);
+		//* DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('hex='.$hex);
 		assert((strlen($hex) % 2) == 0);
 
 		// Walk the string
@@ -2528,7 +2529,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 		);
 
 		// And return it
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput($this->__toString() . ': cacheKey=' . $cacheKey);
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput($this->__toString() . ': cacheKey=' . $cacheKey);
 		return $cacheKey;
 	}
 
@@ -3311,7 +3312,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	 */
 	protected function packString ($str) {
 		// Debug message
-		//* NOISY-DEBUG */ self::createDebugInstance(__CLASS__)->debugOutput('str=' . $str . ' - CALLED!');
+		//* NOISY-DEBUG */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('str=' . $str . ' - CALLED!');
 
 		// First compress the string (gzcompress is okay)
 		$str = gzcompress($str);
@@ -3346,7 +3347,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 		} // END - for
 
 		// Return it
-		//* NOISY-DEBUG */ self::createDebugInstance(__CLASS__)->debugOutput('packed=' . $packed . ' - EXIT!');
+		//* NOISY-DEBUG */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('packed=' . $packed . ' - EXIT!');
 		return $packed;
 	}