Fix #1000: Respect error_reporting

getsentry · Apr 17, 2020 · bc0ec22 · bc0ec22
1 parent f7645df
commit bc0ec22
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/ErrorHandler.php b/src/ErrorHandler.php
@@ -363,10 +363,10 @@ public function addExceptionHandlerListener(callable $listener): void
      */
     private function handleError(int $level, string $message, string $file, int $line, ?array $errcontext = []): bool
     {
-        if (0 === error_reporting()) {
-            $errorAsException = new SilencedErrorException(self::ERROR_LEVELS_DESCRIPTION[$level] . ': ' . $message, 0, $level, $file, $line);
-        } else {
+        if ($level & error_reporting()) {
             $errorAsException = new \ErrorException(self::ERROR_LEVELS_DESCRIPTION[$level] . ': ' . $message, 0, $level, $file, $line);
+        } else {
+            $errorAsException = new SilencedErrorException(self::ERROR_LEVELS_DESCRIPTION[$level] . ': ' . $message, 0, $level, $file, $line);
         }
 
         $backtrace = $this->cleanBacktraceFromErrorHandlerFrames($errorAsException->getTrace(), $errorAsException->getFile(), $errorAsException->getLine());

diff --git a/tests/phpt/error_handler_respects_error_reporting.phpt b/tests/phpt/error_handler_respects_error_reporting.phpt
@@ -46,6 +46,11 @@ echo 'Triggering silenced error' . PHP_EOL;
 
 @$a++;
 
+$errorReporting = error_reporting(E_ALL & ~E_WARNING);
+echo 'Triggering silenced by error_reporting error' . PHP_EOL;
+include 'foo.bar';
+error_reporting($errorReporting);
+
 $client->getOptions()->setCaptureSilencedErrors(false);
 
 echo 'Triggering silenced error' . PHP_EOL;
@@ -55,4 +60,5 @@ echo 'Triggering silenced error' . PHP_EOL;
 --EXPECT--
 Triggering silenced error
 Transport called
+Triggering silenced by error_reporting error
 Triggering silenced error