<?php
+// Import framework stuff
+use 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 - 2015 Core Developer Team
+ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
* @license GNU GPL 3.0 or any newer version
*
* This program is free software: you can redistribute it and/or modify
// The node's own exception handler
function tests_exception_handler ($exceptionInstance) {
// Is it an object and a valid instance?
- if ((is_object($exceptionInstance)) && ($exceptionInstance instanceof FrameworkException)) {
+ if ((is_object($exceptionInstance)) && ($exceptionInstance instanceof Throwable)) {
// Init variable
$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(),
+ ($exceptionInstance instanceof FrameworkException ? $exceptionInstance->getHexCode() : '0x' . bin2hex($exceptionInstance->getCode())),
$exceptionInstance->getFile(),
$exceptionInstance->getLine(),
trim($backTrace)
// Output the message
print($message);
+ } elseif (is_object($exceptionInstance)) {
+ // Output more details
+ printf('exceptionInstance=%s' . PHP_EOL, get_class($exceptionInstance));
} 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));
}
}
assert_options(ASSERT_BAIL , TRUE);
assert_options(ASSERT_QUIET_EVAL, FALSE);
assert_options(ASSERT_CALLBACK , '__assertHandler');
-
-// [EOF]
-?>