Skip to content
This repository has been archived by the owner on Dec 9, 2023. It is now read-only.

Commit

Permalink
[Debug] fix for PHP 7.3.16+/7.4.4+
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolas-grekas committed Mar 23, 2020
1 parent ed3231e commit ce9f3b5
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
4 changes: 2 additions & 2 deletions ErrorHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@ public function handleError($type, $message, $file, $line)
$errorAsException ? ['exception' => $errorAsException] : [],
];
} else {
if (!\defined('HHVM_VERSION')) {
if (\PHP_VERSION_ID < (\PHP_VERSION_ID < 70400 ? 70316 : 70404) && !\defined('HHVM_VERSION')) {
$currentErrorHandler = set_error_handler('var_dump');
restore_error_handler();
}
Expand All @@ -533,7 +533,7 @@ public function handleError($type, $message, $file, $line)
} finally {
$this->isRecursive = false;

if (!\defined('HHVM_VERSION')) {
if (\PHP_VERSION_ID < (\PHP_VERSION_ID < 70400 ? 70316 : 70404) && !\defined('HHVM_VERSION')) {
set_error_handler($currentErrorHandler);
}
}
Expand Down
2 changes: 0 additions & 2 deletions Tests/ErrorHandlerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -327,8 +327,6 @@ public function testHandleDeprecation()
$handler = new ErrorHandler();
$handler->setDefaultLogger($logger);
@$handler->handleError(E_USER_DEPRECATED, 'Foo deprecation', __FILE__, __LINE__, []);

restore_error_handler();
}

/**
Expand Down

0 comments on commit ce9f3b5

Please sign in to comment.