Skip to content

Commit 3805ad1

Browse files
committed
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 667a072 + 8527884 commit 3805ad1

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Error/FatalError.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function __construct(string $message, int $code, array $error, ?int $trac
3131
}
3232
}
3333
} elseif (null !== $traceOffset) {
34-
if (\function_exists('xdebug_get_function_stack') && $trace = @xdebug_get_function_stack()) {
34+
if (\function_exists('xdebug_get_function_stack') && \in_array(\ini_get('xdebug.mode'), ['develop', false], true) && $trace = @xdebug_get_function_stack()) {
3535
if (0 < $traceOffset) {
3636
array_splice($trace, -$traceOffset);
3737
}

0 commit comments

Comments
 (0)