Continued:

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

diff --git a/application/city/exceptions.php b/application/city/exceptions.php
index 9bdbb446e5e4d94bb21194b63a535cbf6a388e8c..f548876ee45d3908e22818eaa9852a24f03959b3 100644 (file)
--- a/application/city/exceptions.php
+++ b/application/city/exceptions.php
@@ -44,7 +44,7 @@ function city_exception_handler ($exceptionInstance) {
                                // Convert arguments type into human-readable
                                foreach ($traceArray['args'] as $arg) {
                                        $argsString .= ', ' . gettype($arg);
-                               } // END - foreach
+                               }
                                $argsString = substr($argsString, 2);
                        }
 
@@ -67,7 +67,7 @@ Line   : %d\n",
                                basename($traceArray['file']),
                                $traceArray['line']
                        );
-               } // END - foreach
+               }
 
                // Construct the message
                $message = sprintf("--------------------------------------------------------------------------------
@@ -117,14 +117,14 @@ function city_error_handler ($errno, $errstr, $errfile, $errline, array $errcont
 
        // Throw an exception here
        throw new FatalErrorException($message, BaseFrameworkSystem::EXCEPTION_FATAL_ERROR);
-} // END - function
+}
 
 // Assertion handler
-function city_assert_handler ($file, $line, $code) {
+function city_assert_handler (string $file, int $line, int $code) {
        // Empty code?
        if ($code === '') {
                $code = '<em>Unknown</em>';
-       } // END - if
+       }
 
        // Create message
        $message = sprintf('File: %s, Line: %s, Code: %s',
@@ -138,7 +138,7 @@ function city_assert_handler ($file, $line, $code) {
 
        // Throw an exception here
        throw new AssertionException($message, BaseFrameworkSystem::EXCEPTION_ASSERTION_FAILED);
-} // END - function
+}
 
 // Set error handler
 //set_error_handler('city_error_handler');