From 1e87185d262c33184d590d1f301935707fb7f927 Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Tue, 3 Sep 2024 10:17:14 +0200
Subject: [PATCH] Fix Xdebug detection

---
 phpunit.xml.dist                 | 1 -
 src/Extension/DebugExtension.php | 6 ++----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 24d5bd9ea..0caf8dad5 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -8,7 +8,6 @@
   </testsuites>
   <php>
     <ini name="error_reporting" value="-1" />
-    <ini name="xdebug.overload_var_dump" value="0" />
   </php>
   <listeners>
     <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
diff --git a/src/Extension/DebugExtension.php b/src/Extension/DebugExtension.php
index cefb44c5b..dac21c317 100644
--- a/src/Extension/DebugExtension.php
+++ b/src/Extension/DebugExtension.php
@@ -22,10 +22,8 @@ final class DebugExtension extends AbstractExtension
     {
         // dump is safe if var_dump is overridden by xdebug
         $isDumpOutputHtmlSafe = \extension_loaded('xdebug')
-            // false means that it was not set (and the default is on) or it explicitly enabled
-            && (false === \ini_get('xdebug.overload_var_dump') || \ini_get('xdebug.overload_var_dump'))
-            // false means that it was not set (and the default is on) or it explicitly enabled
-            // xdebug.overload_var_dump produces HTML only when html_errors is also enabled
+            // Xdebug overloads var_dump in develop mode when html_errors is enabled
+            && str_contains(\ini_get('xdebug.mode'), 'develop')
             && (false === \ini_get('html_errors') || \ini_get('html_errors'))
             || 'cli' === \PHP_SAPI
         ;