Skip to content

Commit 188af0f

Browse files
committed
Merge branch '6.4' into 7.0
* 6.4: [Serializer] Improve exception message in UnwrappingDenormalizer [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 Return false in isTtySupported() when open_basedir restrictions prevent access to /dev/tty. Remove calls to `TestCase::iniSet()` and calls to deprecated methods of `MockBuilder` [PhpUnitBridge] Fix `DeprecationErrorHandler` with PhpUnit 10
2 parents 0a0b90b + 15607a3 commit 188af0f

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

Diff for: DeprecationErrorHandler.php

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

368368
if ('PHPUnit\Util\ErrorHandler::handleError' === $eh) {
369369
return $eh;
370+
} elseif (ErrorHandler::class === $eh) {
371+
return function (int $errorNumber, string $errorString, string $errorFile, int $errorLine) {
372+
ErrorHandler::instance()($errorNumber, $errorString, $errorFile, $errorLine);
373+
374+
return true;
375+
};
370376
}
371377

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

0 commit comments

Comments
 (0)