From cb47b537f3c2e5e3a89a6cfe03d4ae1def87ca95 Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Sun, 28 Jul 2013 20:35:20 +0200
Subject: [PATCH] Fix feedback

---
 src/Monolog/ErrorHandler.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/Monolog/ErrorHandler.php b/src/Monolog/ErrorHandler.php
index 878fbc44..eed141f7 100644
--- a/src/Monolog/ErrorHandler.php
+++ b/src/Monolog/ErrorHandler.php
@@ -75,12 +75,12 @@ class ErrorHandler
         }
     }
 
-    public function registerErrorHandler($levelMap = array(), $callPrevious = true, $errorTypes = -1)
+    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);
-        if ($callPrevious && $prev) {
-            $this->previousErrorHandler = $prev;
+        if ($callPrevious) {
+            $this->previousErrorHandler = $prev ?: true;
         }
     }
 
@@ -89,7 +89,7 @@ class ErrorHandler
         register_shutdown_function(array($this, 'handleFatalError'));
 
         $this->reservedMemory = str_repeat(' ', 1024 * $reservedMemorySize);
-        $this->fatalLevel = $level === null ? Logger::CRITICAL : $level;
+        $this->fatalLevel = $level === null ? Logger::ALERT : $level;
     }
 
     protected function defaultErrorLevelMap()
@@ -137,7 +137,9 @@ class ErrorHandler
         $level = isset($this->errorLevelMap[$code]) ? $this->errorLevelMap[$code] : Logger::CRITICAL;
         $this->logger->log($level, self::codeToString($code).': '.$message, array('file' => $file, 'line' => $line));
 
-        if ($this->previousErrorHandler) {
+        if ($this->previousErrorHandler === true) {
+            return false;
+        } elseif ($this->previousErrorHandler) {
             return call_user_func($this->previousErrorHandler, $code, $message, $file, $line, $context);
         }
     }