bug #40679 [Debug][ErrorHandler] Avoid warning with Xdebug 3 with dev…

…elop mode disabled (Jean85) 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
symfony · Apr 6, 2021 · e357dbb · e357dbb
2 parents 3b1948f + 0e0639b
commit e357dbb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
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);
                 }