Skip to content

Commit 15607a3

Browse files
committedMay 17, 2024
Merge branch '5.4' into 6.4
* 5.4: [PropertyInfo] Update DoctrineExtractor for new DBAL 4 BIGINT type Update security.nl.xlf [Validator] IBAN Check digits should always between 2 and 98 [Security] Populate translations for trans-unit 20 add missing plural translation messages filter out empty HTTP header parts [String] Fix folded in compat mode Remove calls to `getMockForAbstractClass()` [ErrorHandler] Do not call xdebug_get_function_stack() with xdebug >= 3.0 when not in develop mode [Serializer] Fix type for missing property add test for JSON response with null as content [Filesystem] Fix dumpFile `stat failed` error hitting custom handler Remove calls to `TestCase::iniSet()` and calls to deprecated methods of `MockBuilder` [PhpUnitBridge] Fix `DeprecationErrorHandler` with PhpUnit 10
2 parents a33ca73 + b21398f commit 15607a3

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed
 

‎DeprecationErrorHandler.php

+6
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,12 @@ private static function getPhpUnitErrorHandler(): callable
376376

377377
if ('PHPUnit\Util\ErrorHandler::handleError' === $eh) {
378378
return $eh;
379+
} elseif (ErrorHandler::class === $eh) {
380+
return function (int $errorNumber, string $errorString, string $errorFile, int $errorLine) {
381+
ErrorHandler::instance()($errorNumber, $errorString, $errorFile, $errorLine);
382+
383+
return true;
384+
};
379385
}
380386

381387
foreach (debug_backtrace(\DEBUG_BACKTRACE_PROVIDE_OBJECT | \DEBUG_BACKTRACE_IGNORE_ARGS) as $frame) {

0 commit comments

Comments
 (0)
Please sign in to comment.