Browse Source

Fix error_handler return type declaration

Thomas Perez 6 years ago
parent
commit
4e095f38f4

+ 2 - 0
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;
     }
 
     /**

+ 3 - 1
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

+ 4 - 0
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();

+ 2 - 0
tests/Monolog/Handler/RotatingFileHandlerTest.php

@@ -34,6 +34,8 @@ class RotatingFileHandlerTest extends TestCase
                 'code' => $code,
                 'message' => $message,
             ];
+
+            return true;
         });
     }