Merge branch '4.4' into 5.2

derrabus · derrabus · commit ea3ddbf67615 · 2021-04-07T17:57:33.000+02:00
* 4.4:
  Avoid warning with Xdebug 3 with develop mode disabled
diff --git a/Error/FatalError.php b/Error/FatalError.php
@@ -33,8 +33,7 @@ public function __construct(string $message, int $code, array $error, int $trace
                 }
             }
         } 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);
                 }

Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,7 @@ public function __construct(string $message, int $code, array $error, int $trace`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`	`} elseif (null !== $traceOffset) {`
`36`		`- if (\function_exists('xdebug_get_function_stack')) {`
`37`		`- $trace = xdebug_get_function_stack();`
	`36`	`+ if (\function_exists('xdebug_get_function_stack') && $trace = @xdebug_get_function_stack()) {`
`38`	`37`	`if (0 < $traceOffset) {`
`39`	`38`	`array_splice($trace, -$traceOffset);`
`40`	`39`	`}`