mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-10-21 16:46:11 +02:00
Code Issues Releases Wiki Activity

Add tests and fix issue with array_merge

Browse Source
This commit is contained in:
Jordi Boggiano
2013-07-28 21:16:34 +02:00
parent cb47b537f3
commit 01e1ee7541
2 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Monolog/ErrorHandler.php
View File

@@ -78,7 +78,12 @@ class ErrorHandler
public function registerErrorHandler(array $levelMap = array(), $callPrevious = true, $errorTypes = -1)
{
$prev = set_error_handler(array($this, 'handleError'), $errorTypes);
$this->errorLevelMap = array_merge($this->defaultErrorLevelMap(), $levelMap);
$this->errorLevelMap = $this->defaultErrorLevelMap();
// merging the map into the defaults by hand because array_merge
// trips up on numeric keys
foreach ($levelMap as $key => $val) {
$this->errorLevelMap[$key] = $val;
}
if ($callPrevious) {
$this->previousErrorHandler = $prev ?: true;
}