Intercept fatal errors using register_shutdown_function

Related discussion in #569

2 files changed, 17 insertions, 1 deletions

diff --git a/framework/Exceptions/TErrorHandler.php b/framework/Exceptions/TErrorHandler.php
index f9a120ac..02f86f5e 100644
--- a/framework/Exceptions/TErrorHandler.php
+++ b/framework/Exceptions/TErrorHandler.php
@@ -345,7 +345,12 @@ class TErrorHandler extends TModule
 		// if PHP exception, we want to show the 2nd stack level context
 		// because the 1st stack level is of little use (it's in error handler)
 		if($exception instanceof TPhpErrorException)
-			$result=isset($trace[0]['file'])?$trace[0]:$trace[1];
+		{
+			if(isset($trace[0]['file']))
+				$result=$trace[0];
+			elseif(isset($trace[1]))
+				$result=$trace[1];
+		}
 		else if($exception instanceof TInvalidOperationException)
 		{
 			// in case of getter or setter error, find out the exact file and row
diff --git a/framework/Exceptions/TException.php b/framework/Exceptions/TException.php
index 651adb5a..033f7667 100644
--- a/framework/Exceptions/TException.php
+++ b/framework/Exceptions/TException.php
@@ -357,6 +357,17 @@ class TPhpErrorException extends TSystemException
 		$errorType=isset($errorTypes[$errno])?$errorTypes[$errno]:'Unknown Error';
 		parent::__construct("[$errorType] $errstr (@line $errline in file $errfile).");
 	}
+
+    /**
+     * Returns if error is one of fatal type.
+     *
+     * @param array $error error got from error_get_last()
+     * @return boolean if error is one of fatal type
+     */
+    public static function isFatalError($error)
+    {
+        return isset($error['type']) && in_array($error['type'], array(E_ERROR, E_PARSE, E_CORE_ERROR, E_CORE_WARNING, E_COMPILE_ERROR, E_COMPILE_WARNING));
+    }
 }