bug #40679 [Debug][ErrorHandler] Avoid warning with Xdebug 3 with develop mode disabled (Jean85)

xabbuh · xabbuh · commit e357dbb17309 · 2021-04-06T09:22:26.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [Debug][ErrorHandler] Avoid warning with Xdebug 3 with develop mode disabled | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #40677 | License | MIT As reported in #40677, this fix is needed when Xdebug 3 is enabled but its `develop` mode is off. Commits ------- 0e0639b Avoid warning with Xdebug 3 with develop mode disabled
diff --git a/src/Symfony/Component/Debug/Exception/FatalErrorException.php b/src/Symfony/Component/Debug/Exception/FatalErrorException.php
@@ -35,8 +35,7 @@ public function __construct(string $message, int $code, int $severity, string $f
 
             $this->setTrace($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);
                 }
diff --git a/src/Symfony/Component/ErrorHandler/Error/FatalError.php b/src/Symfony/Component/ErrorHandler/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
`@@ -35,8 +35,7 @@ public function __construct(string $message, int $code, int $severity, string $f`
`35`	`35`
`36`	`36`	`$this->setTrace($trace);`
`37`	`37`	`} elseif (null !== $traceOffset) {`
`38`		`- if (\function_exists('xdebug_get_function_stack')) {`
`39`		`- $trace = xdebug_get_function_stack();`
	`38`	`+ if (\function_exists('xdebug_get_function_stack') && $trace = @xdebug_get_function_stack()) {`
`40`	`39`	`if (0 < $traceOffset) {`
`41`	`40`	`array_splice($trace, -$traceOffset);`
`42`	`41`	`}`
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`	`}`