Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

debug: Refactor from $levelName to $prefix in handleError()

Browse source 
No behavioural change. This change in abstraction is prep
for I1d4a166b6df and makes that diff cleaner.

Change-Id: If3f5836fcb2fc0c16aa1c3bdc1333d8c8f892f3b
This commit is contained in:
Timo Tijhof 2020-06-07 23:55:36 +01:00
parent e2b8d05850
commit ff681fe02d
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
includes/exception/MWExceptionHandler.php
View file

@ -225,39 +225,39 @@ class MWExceptionHandler {
case E_WARNING:
case E_CORE_WARNING:
case E_COMPILE_WARNING:
$levelName = 'Warning';
$prefix = 'PHP Warning: ';
$severity = LogLevel::ERROR;
break;
case E_NOTICE:
$levelName = 'Notice';
$prefix = 'PHP Notice: ';
$severity = LogLevel::ERROR;
break;
case E_USER_NOTICE:
// Used by wfWarn(), MWDebug::warning()
$levelName = 'Notice';
$prefix = 'PHP Notice: ';
$severity = LogLevel::WARNING;
break;
case E_USER_WARNING:
// Used by wfWarn(), MWDebug::warning()
$levelName = 'Warning';
$prefix = 'PHP Warning: ';
$severity = LogLevel::WARNING;
break;
case E_STRICT:
$levelName = 'Strict Standards';
$prefix = 'PHP Strict Standards: ';
$severity = LogLevel::WARNING;
break;
case E_DEPRECATED:
case E_USER_DEPRECATED:
$levelName = 'Deprecated';
$prefix = 'PHP Deprecated: ';
$severity = LogLevel::WARNING;
break;
default:
$levelName = 'Unknown error';
$prefix = 'PHP Unknown error: ';
$severity = LogLevel::ERROR;
break;
}
$e = new ErrorException( "PHP $levelName: $message", 0, $level, $file, $line );
$e = new ErrorException( $prefix . $message, 0, $level, $file, $line );
self::logError( $e, 'error', $severity, self::CAUGHT_BY_HANDLER );
// If $wgPropagateErrors is true return false so PHP shows/logs the error normally.