From 4e095f38f4f626829c247adba70cc723d986fa70 Mon Sep 17 00:00:00 2001
From: Thomas Perez <thomas@scullwm.com>
Date: Wed, 31 Jul 2019 22:19:02 +0200
Subject: [PATCH] Fix error_handler return type declaration

---
 src/Monolog/ErrorHandler.php                        | 2 ++
 src/Monolog/Handler/StreamHandler.php               | 4 +++-
 tests/Monolog/Formatter/NormalizerFormatterTest.php | 4 ++++
 tests/Monolog/Handler/RotatingFileHandlerTest.php   | 2 ++
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/Monolog/ErrorHandler.php b/src/Monolog/ErrorHandler.php
index 3d386606..2643fdb8 100644
--- a/src/Monolog/ErrorHandler.php
+++ b/src/Monolog/ErrorHandler.php
@@ -200,6 +200,8 @@ class ErrorHandler
         } elseif ($this->previousErrorHandler) {
             return call_user_func($this->previousErrorHandler, $code, $message, $file, $line, $context);
         }
+
+        return true;
     }
 
     /**
diff --git a/src/Monolog/Handler/StreamHandler.php b/src/Monolog/Handler/StreamHandler.php
index 2cee3f21..0c2f8d1b 100644
--- a/src/Monolog/Handler/StreamHandler.php
+++ b/src/Monolog/Handler/StreamHandler.php
@@ -134,9 +134,11 @@ class StreamHandler extends AbstractProcessingHandler
         fwrite($stream, (string) $record['formatted']);
     }
 
-    private function customErrorHandler($code, $msg): void
+    private function customErrorHandler($code, $msg): bool
     {
         $this->errorMessage = preg_replace('{^(fopen|mkdir)\(.*?\): }', '', $msg);
+
+        return true;
     }
 
     private function getDirFromStream(string $stream): ?string
diff --git a/tests/Monolog/Formatter/NormalizerFormatterTest.php b/tests/Monolog/Formatter/NormalizerFormatterTest.php
index 8f3499a5..9f914883 100644
--- a/tests/Monolog/Formatter/NormalizerFormatterTest.php
+++ b/tests/Monolog/Formatter/NormalizerFormatterTest.php
@@ -182,6 +182,8 @@ class NormalizerFormatterTest extends \PHPUnit\Framework\TestCase
                 restore_error_handler();
                 $that->fail("$message should not be raised");
             }
+
+            return true;
         });
 
         $formatter = new NormalizerFormatter();
@@ -215,6 +217,8 @@ class NormalizerFormatterTest extends \PHPUnit\Framework\TestCase
                 restore_error_handler();
                 $that->fail("$message should not be raised");
             }
+
+            return true;
         });
 
         $formatter = new NormalizerFormatter();
diff --git a/tests/Monolog/Handler/RotatingFileHandlerTest.php b/tests/Monolog/Handler/RotatingFileHandlerTest.php
index 7d3e8c4f..35dbcc27 100644
--- a/tests/Monolog/Handler/RotatingFileHandlerTest.php
+++ b/tests/Monolog/Handler/RotatingFileHandlerTest.php
@@ -34,6 +34,8 @@ class RotatingFileHandlerTest extends TestCase
                 'code' => $code,
                 'message' => $message,
             ];
+
+            return true;
         });
     }