Continued:

[city.git] / application / city / exceptions.php

diff --git a/application/city/exceptions.php b/application/city/exceptions.php
index 3538bd31dbe85bcf1a5ef49348df432255e9408e..12c5c09b8ba1ac7501b3f6c7da6f5bcc8b2fba21 100644 (file)
--- a/application/city/exceptions.php
+++ b/application/city/exceptions.php
@@ -26,7 +26,7 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  */
 
 // The node's own exception handler
-function tests_exception_handler ($exceptionInstance) {
+function city_exception_handler ($exceptionInstance) {
        // Is it an object and a valid instance?
        if ((is_object($exceptionInstance)) && ($exceptionInstance instanceof Exception)) {
                // Init variable
@@ -101,7 +101,7 @@ Backtrace:
 }
 
 // Error handler
-function tests_error_handler ($errno, $errstr, $errfile, $errline, array $errcontext) {
+function city_error_handler ($errno, $errstr, $errfile, $errline, array $errcontext) {
        // Construct the message
        $message = sprintf('File: %s, Line: %s, Code: %s, Message: %s',
                basename($errfile),
@@ -115,7 +115,7 @@ function tests_error_handler ($errno, $errstr, $errfile, $errline, array $errcon
 } // END - function
 
 // Assertion handler
-function tests_assert_handler ($file, $line, $code) {
+function city_assert_handler ($file, $line, $code) {
        // Empty code?
        if ($code === '') {
                $code = '<em>Unknown</em>';
@@ -136,14 +136,14 @@ function tests_assert_handler ($file, $line, $code) {
 } // END - function
 
 // Set error handler
-//set_error_handler('tests_error_handler');
+//set_error_handler('city_error_handler');
 
 // Set the new handler
-set_exception_handler('tests_exception_handler');
+set_exception_handler('city_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  , 'tests_assert_handler');
+assert_options(ASSERT_CALLBACK  , 'city_assert_handler');