adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added try/catch block into ErrorHandler::handleException() to gracefully show Exceptions raised during exception handling. Fixes #1707

Browse source
This commit is contained in:
Thomas Ploch 2011-05-15 16:15:06 +02:00 committed by mark_story
parent 6289f20b83
commit 085c621c0e
1 changed files with 25 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
lib/Cake/Error/ErrorHandler.php
View file

@ -107,22 +107,32 @@ class ErrorHandler {
* @see http://php.net/manual/en/function.set-exception-handler.php
*/
public static function handleException(Exception $exception) {
$config = Configure::read('Exception');
if (!empty($config['log'])) {
$message = sprintf("[%s] %s\n%s",
get_class($exception),
$exception->getMessage(),
$exception->getTraceAsString()
try {
$config = Configure::read('Exception');
if (!empty($config['log'])) {
$message = sprintf("[%s] %s\n%s",
get_class($exception),
$exception->getMessage(),
$exception->getTraceAsString()
);
CakeLog::write(LOG_ERR, $message);
}
$renderer = $config['renderer'];
if ($renderer !== 'ExceptionRenderer') {
list($plugin, $renderer) = pluginSplit($renderer, true);
App::uses($renderer, $plugin . 'Error');
}
$error = new $renderer($exception);
$error->render();
} catch (Exception $e) {
$message = $e->getMessage()."\nCall Stack:\n".$e->getTraceAsString();
ErrorHandler::handleError(
E_ERROR,
$message,
$e->getFile(),
$e->getLine()
);
CakeLog::write(LOG_ERR, $message);
}
$renderer = $config['renderer'];
if ($renderer !== 'ExceptionRenderer') {
list($plugin, $renderer) = pluginSplit($renderer, true);
App::uses($renderer, $plugin . 'Error');
}
$error = new $renderer($exception);
$error->render();
}
/**
@ -178,6 +188,7 @@ class ErrorHandler {
* @return array Array of error word, and log location.
*/
protected static function _mapErrorCode($code) {
$error = $log = null;
switch ($code) {
case E_PARSE:
case E_ERROR: