Merge branch 'hotfix/4609' into develop

Forward port zendframework/zendframework#4609

src/Logger.php

@@ -147,11 +147,11 @@ public function __construct(array $options = null)
             }
 
             if (isset($options['exceptionhandler']) && $options['exceptionhandler'] === true) {
-                self::registerExceptionHandler($this);
+                static::registerExceptionHandler($this);
             }
 
             if (isset($options['errorhandler']) && $options['errorhandler'] === true) {
-                self::registerErrorHandler($this);
+                static::registerErrorHandler($this);
             }
 
         }
@@ -517,24 +517,23 @@ public static function registerErrorHandler(Logger $logger, $continueNativeHandl
             return false;
         }
 
-        $errorHandlerMap = static::$errorPriorityMap;
+        $errorPriorityMap = static::$errorPriorityMap;
 
-        $previous = set_error_handler(function ($level, $message, $file, $line, $context)
-            use ($logger, $errorHandlerMap, $continueNativeHandler)
+        $previous = set_error_handler(function ($level, $message, $file, $line)
+            use ($logger, $errorPriorityMap, $continueNativeHandler)
         {
             $iniLevel = error_reporting();
 
             if ($iniLevel & $level) {
-                if (isset(Logger::$errorPriorityMap[$level])) {
-                    $priority = $errorHandlerMap[$level];
+                if (isset($errorPriorityMap[$level])) {
+                    $priority = $errorPriorityMap[$level];
                 } else {
                     $priority = Logger::INFO;
                 }
                 $logger->log($priority, $message, array(
                     'errno'   => $level,
                     'file'    => $file,
                     'line'    => $line,
-                    'context' => $context,
                 ));
             }