Merge branch '5.2' into 5.x
* 5.2: Avoid warning with Xdebug 3 with develop mode disabled
This commit is contained in:
commit
47f3c4e52d
@ -33,8 +33,7 @@ class FatalError extends \Error
|
||||
}
|
||||
}
|
||||
} elseif (null !== $traceOffset) {
|
||||
if (\function_exists('xdebug_get_function_stack')) {
|
||||
$trace = xdebug_get_function_stack();
|
||||
if (\function_exists('xdebug_get_function_stack') && $trace = @xdebug_get_function_stack()) {
|
||||
if (0 < $traceOffset) {
|
||||
array_splice($trace, -$traceOffset);
|
||||
}
|
||||
|
Reference in New Issue
Block a user