X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=application%2Ftests%2Fexceptions.php;h=a336bb98e68c8d0d22afeac9d5b8bc64fad01e81;hp=e483dafd1ee8add7fe8d61d3de1710077d7bf5b8;hb=HEAD;hpb=9f6bf1d193eca4ea47e4a126ed5d1f2f8aac03a7

diff --git a/application/tests/exceptions.php b/application/tests/exceptions.php
index e483dafd..06acedd4 100644
--- a/application/tests/exceptions.php
+++ b/application/tests/exceptions.php
@@ -1,10 +1,16 @@
 <?php
+// Import framework stuff
+use Org\Mxchange\CoreFramework\Assertion\AssertionException;
+use Org\Mxchange\CoreFramework\Error\FatalErrorException;
+use Org\Mxchange\CoreFramework\Generic\FrameworkException;
+use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * An include file for setting up the exception handler of test suite
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
- * @version		0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2014 Core Developer Team
+ * @version		0.0.0
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2023 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,22 +28,28 @@
  */
 
 // The node's own exception handler
-function tests_exception_handler ($exceptionInstance) {
+function core_exception_handler ($exceptionInstance) {
 	// Is it an object and a valid instance?
-	if ((is_object($exceptionInstance)) && ($exceptionInstance instanceof FrameworkException)) {
+	if ((is_object($exceptionInstance)) && ($exceptionInstance instanceof Exception)) {
 		// Init variable
 		$backTrace = '';
 
+		// Generate exception code
+		$exceptionCode = ($exceptionInstance instanceof FrameworkException ? $exceptionInstance->getHexCode() : '0x' . bin2hex($exceptionInstance->getCode()));
+
 		// Get all call levels from backtrace
 		foreach ($exceptionInstance->getTrace() as $idx => $traceArray) {
 			// Init argument string
 			$argsString = '';
 
-			// Convert arguments type into human-readable
-			foreach ($traceArray['args'] as $arg) {
-				$argsString .= ', ' . gettype($arg);
-			} // END - foreach
-			$argsString = substr($argsString, 2);
+			// Arguments given?
+			if (isset($traceArray['args'])) {
+				// Convert arguments type into human-readable
+				foreach ($traceArray['args'] as $arg) {
+					$argsString .= ', ' . gettype($arg);
+				}
+				$argsString = substr($argsString, 2);
+			}
 
 			// Set missing file/line
 			if (!isset($traceArray['file']))  $traceArray['file']  = 'unknown';
@@ -58,7 +70,7 @@ Line   : %d\n",
 				basename($traceArray['file']),
 				$traceArray['line']
 			);
-		} // END - foreach
+		}
 
 		// Construct the message
 		$message = sprintf("--------------------------------------------------------------------------------
@@ -73,9 +85,9 @@ Backtrace:
 --------------------------------------------------------------------------------
 %s
 --------------------------------------------------------------------------------\n",
-			trim(html_entity_decode(strip_tags($exceptionInstance->__toString()))),
+			trim(html_entity_decode(strip_tags(get_class($exceptionInstance)))),
 			trim(html_entity_decode(strip_tags($exceptionInstance->getMessage()))),
-			$exceptionInstance->getHexCode(),
+			$exceptionCode,
 			$exceptionInstance->getFile(),
 			$exceptionInstance->getLine(),
 			trim($backTrace)
@@ -83,18 +95,28 @@ Backtrace:
 
 		// Output the message
 		print($message);
+
+		// Exit with code
+		exit(hexdec($exceptionCode));
+	} elseif (is_object($exceptionInstance)) {
+		// Output more details
+		printf('exceptionInstance=%s', print_r($exceptionInstance, true));
+		exit(255);
 	} else {
-		// Invalid exception instance detected! Do *only* throw exceptions that
-		// extends our own exception 'FrameworkException' to get such nice
-		// outputs like above.
-		print('exceptionInstance[]=' . gettype($exceptionInstance) . ' is invalid! Please inform the core developer team.');
+		/*
+		 * Invalid exception instance detected! Do *only* throw exceptions that
+		 * extends our own exception 'FrameworkException' to get such nice
+		 * outputs like above.
+		 */
+		printf('exceptionInstance[]=%s is invalid! Please inform the core developer team.' . PHP_EOL, gettype($exceptionInstance));
+		exit(255);
 	}
 }
 
 // Error handler
-function __errorHandler ($errno, $errstr, $errfile, $errline, array $errcontext) {
+function core_error_handler (int $errno, string $errstr, string $errfile, int $errline, array $errcontext) {
 	// Construct the message
-	$message = sprintf('File: %s, Line: %s, Code: %s, Message: %s',
+	$message = sprintf('File: %s, Line: %d, Code: %d, Message: %s',
 		basename($errfile),
 		$errline,
 		$errno,
@@ -103,14 +125,14 @@ function __errorHandler ($errno, $errstr, $errfile, $errline, array $errcontext)
 
 	// Throw an exception here
 	throw new FatalErrorException($message, BaseFrameworkSystem::EXCEPTION_FATAL_ERROR);
-} // END - function
+}
 
 // Assertion handler
-function __assertHandler ($file, $line, $code) {
+function core_assert_handler (string $file, int $line, int $code) {
 	// Empty code?
-	if ($code === '') {
+	if (empty($code)) {
 		$code = '<em>Unknown</em>';
-	} // END - if
+	}
 
 	// Create message
 	$message = sprintf('File: %s, Line: %s, Code: %s',
@@ -124,20 +146,17 @@ function __assertHandler ($file, $line, $code) {
 
 	// Throw an exception here
 	throw new AssertionException($message, BaseFrameworkSystem::EXCEPTION_ASSERTION_FAILED);
-} // END - function
+}
 
 // Set error handler
-//set_error_handler('__errorHandler');
+//set_error_handler('core_error_handler');
 
 // Set the new handler
-set_exception_handler('tests_exception_handler');
+set_exception_handler('core_exception_handler');
 
 // Init assert handling
-assert_options(ASSERT_ACTIVE    , TRUE);
-assert_options(ASSERT_WARNING   , FALSE);
-assert_options(ASSERT_BAIL      , TRUE);
-assert_options(ASSERT_QUIET_EVAL, FALSE);
-assert_options(ASSERT_CALLBACK  , '__assertHandler');
-
-// [EOF]
-?>
+assert_options(ASSERT_ACTIVE    , true);
+assert_options(ASSERT_WARNING   , true);
+assert_options(ASSERT_BAIL      , true);
+assert_options(ASSERT_QUIET_EVAL, false);
+assert_options(ASSERT_CALLBACK  , 'core_assert_handler');