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

Merge pull request #8518 from garethellis36/customize-logged-error-message

Browse source 
[2.x] Extracts error trace in ErrorHandler to a helper function to allow customization
This commit is contained in:
Mark Story 2016-03-23 21:20:30 -04:00
commit 96c9521802
2 changed files with 31 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -207,7 +207,6 @@ class ErrorHandler {
if (error_reporting() === 0) { if (error_reporting() === 0) {
return false; return false;
} }
$errorConfig = Configure::read('Error');
list($error, $log) = static::mapErrorCode($code); list($error, $log) = static::mapErrorCode($code);
if ($log === LOG_ERR) { if ($log === LOG_ERR) {
return static::handleFatalError($code, $description, $file, $line); return static::handleFatalError($code, $description, $file, $line);
@ -228,21 +227,7 @@ class ErrorHandler {
); );
return Debugger::getInstance()->outputError($data); return Debugger::getInstance()->outputError($data);
} }
$message = $error . ' (' . $code . '): ' . $description . ' in [' . $file . ', line ' . $line . ']'; $message = static::_getErrorMessage($error, $code, $description, $file, $line);
if (!empty($errorConfig['trace'])) {
// https://bugs.php.net/bug.php?id=65322
if (version_compare(PHP_VERSION, '5.4.21', '<')) {
if (!class_exists('Debugger')) {
App::load('Debugger');
}
if (!class_exists('CakeText')) {
App::uses('CakeText', 'Utility');
App::load('CakeText');
}
}
$trace = Debugger::trace(array('start' => 1, 'format' => 'log'));
$message .= "\nTrace:\n" . $trace . "\n";
}
return CakeLog::write($log, $message); return CakeLog::write($log, $message);
} }
@ -328,4 +313,33 @@ class ErrorHandler {
return array($error, $log); return array($error, $log);
} }
/**
* Generate the string to use to describe the error.
*
* @param string $error The error type (e.g. "Warning")
* @param int $code Code of error
* @param string $description Error description
* @param string $file File on which error occurred
* @param int $line Line that triggered the error
* @return string
*/
protected static function _getErrorMessage($error, $code, $description, $file, $line) {
$errorConfig = Configure::read('Error');
$message = $error . ' (' . $code . '): ' . $description . ' in [' . $file . ', line ' . $line . ']';
if (!empty($errorConfig['trace'])) {
// https://bugs.php.net/bug.php?id=65322
if (version_compare(PHP_VERSION, '5.4.21', '<')) {
if (!class_exists('Debugger')) {
App::load('Debugger');
}
if (!class_exists('CakeText')) {
App::uses('CakeText', 'Utility');
App::load('CakeText');
}
}
$trace = Debugger::trace(array('start' => 1, 'format' => 'log'));
$message .= "\nTrace:\n" . $trace . "\n";
}
return $message;
}
} }

2
lib/Cake/Test/Case/Error/ErrorHandlerTest.php
View file

@ -203,7 +203,7 @@ class ErrorHandlerTest extends CakeTestCase {
$result[0] $result[0]
); );
$this->assertRegExp('/^Trace:/', $result[1]); $this->assertRegExp('/^Trace:/', $result[1]);
$this->assertRegExp('/^ErrorHandlerTest\:\:testHandleErrorLoggingTrace\(\)/', $result[2]); $this->assertRegExp('/^ErrorHandlerTest\:\:testHandleErrorLoggingTrace\(\)/', $result[3]);
if (file_exists(LOGS . 'debug.log')) { if (file_exists(LOGS . 'debug.log')) {
unlink(LOGS . 'debug.log'); unlink(LOGS . 'debug.log');
} }