Respect the result of any user-defined error handling

src/Handlers/ErrorHandler.php

@@ -6,33 +6,47 @@
 
 class ErrorHandler extends AbstractHandler
 {
-    
+
     public function register()
     {
         $this->previousHandler = set_error_handler(array($this, 'handle'));
-        
+
         parent::register();
     }
-    
+
     public function handle()
     {
         /**
          * Overloading methods with different parameters is not supported in PHP
          * through language structures. This hack allows to simulate that.
          */
         $args = func_get_args();
-        
+
         if (!isset($args[0]) || !isset($args[1])) {
             throw new \Exception('No $errno or $errstr to be passed to the error handler.');
         }
-        
+
         $errno = $args[0];
         $errstr = $args[1];
         $errfile = isset($args[2]) ? $args[2] : null;
         $errline = isset($args[3]) ? $args[3] : null;
-        
+
         parent::handle();
-
+
+        if (!is_null($this->previous_handler)) {
+            $stop_processing = call_user_func(
+                $this->previous_handler,
+                $errno,
+                $errstr,
+                $errfile,
+                $errline
+            );
+
+            if ($stop_processing) {
+                return $stop_processing;
+            }
+        }
+
         if (is_null($this->logger())) {
             return false;
         }
@@ -45,17 +59,7 @@ public function handle()
                             generateErrorWrapper($errno, $errstr, $errfile, $errline);
 
         $this->logger()->log(Level::ERROR, $exception, array(), true);
-
-        if ($this->previousHandler !== null) {
-            call_user_func(
-                $this->previousHandler,
-                $errno,
-                $errstr,
-                $errfile,
-                $errline
-            );
-        }
-
+
         return false;
     }
 }