Merge branch '5.2' into 5.x

* 5.2:
  Avoid warning with Xdebug 3 with develop mode disabled
This commit is contained in:
Alexander M. Turek 2021-04-07 17:57:56 +02:00
commit 47f3c4e52d

View File

@ -33,8 +33,7 @@ class FatalError extends \Error
} }
} }
} elseif (null !== $traceOffset) { } elseif (null !== $traceOffset) {
if (\function_exists('xdebug_get_function_stack')) { if (\function_exists('xdebug_get_function_stack') && $trace = @xdebug_get_function_stack()) {
$trace = xdebug_get_function_stack();
if (0 < $traceOffset) { if (0 < $traceOffset) {
array_splice($trace, -$traceOffset); array_splice($trace, -$traceOffset);
} }