bug #54919 [ErrorHandler] Do not call xdebug_get_function_stack() with xdebug >= 3.0 when not in develop mode (fmata)

nicolas-grekas · nicolas-grekas · commit 6049793d1eca · 2024-05-15T17:00:03.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [ErrorHandler] Do not call xdebug_get_function_stack() with xdebug >= 3.0 when not in develop mode | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #40677 | License | MIT The PR #40787 was rejected because of env var handling in xdebug_mode. xdebug/xdebug#737 allow us to get xdebug_mode in all cases so I think we can merge this PR safely. Tested on my setup successfully, I have no more warning. Thanks `@ralphschindler` :) Commits ------- a8114fe [ErrorHandler] Do not call xdebug_get_function_stack() with xdebug >= 3.0 when not in develop mode
diff --git a/src/Symfony/Component/ErrorHandler/Error/FatalError.php b/src/Symfony/Component/ErrorHandler/Error/FatalError.php
@@ -33,7 +33,7 @@ public function __construct(string $message, int $code, array $error, ?int $trac
                 }
             }
         } elseif (null !== $traceOffset) {
-            if (\function_exists('xdebug_get_function_stack') && $trace = @xdebug_get_function_stack()) {
+            if (\function_exists('xdebug_get_function_stack') && \in_array(\ini_get('xdebug.mode'), ['develop', false], true) && $trace = @xdebug_get_function_stack()) {
                 if (0 < $traceOffset) {
                     array_splice($trace, -$traceOffset);
                 }

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public function __construct(string $message, int $code, array $error, ?int $trac`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`	`} elseif (null !== $traceOffset) {`
`36`		`- if (\function_exists('xdebug_get_function_stack') && $trace = @xdebug_get_function_stack()) {`
	`36`	`+ if (\function_exists('xdebug_get_function_stack') && \in_array(\ini_get('xdebug.mode'), ['develop', false], true) && $trace = @xdebug_get_function_stack()) {`
`37`	`37`	`if (0 < $traceOffset) {`
`38`	`38`	`array_splice($trace, -$traceOffset);`
`39`	`39`	`}`