Leverage get_error_handler()

derrabus · derrabus · commit 64443ffabf50 · 2025-07-08T19:39:48.000+02:00
diff --git a/composer.json b/composer.json
@@ -55,6 +55,7 @@
         "symfony/polyfill-intl-normalizer": "~1.0",
         "symfony/polyfill-mbstring": "~1.0",
         "symfony/polyfill-php83": "^1.28",
+        "symfony/polyfill-php85": "^1.32",
         "symfony/polyfill-uuid": "^1.15"
     },
     "replace": {
diff --git a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
@@ -103,8 +103,7 @@ public function boot(): void
         $_ENV['DOCTRINE_DEPRECATIONS'] = $_SERVER['DOCTRINE_DEPRECATIONS'] ??= 'trigger';
 
         if (class_exists(SymfonyRuntime::class)) {
-            $handler = set_error_handler('var_dump');
-            restore_error_handler();
+            $handler = get_error_handler();
         } else {
             $handler = [ErrorHandler::register(null, false)];
         }
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -28,6 +28,7 @@
         "symfony/http-foundation": "^7.3|^8.0",
         "symfony/http-kernel": "^7.2|^8.0",
         "symfony/polyfill-mbstring": "~1.0",
+        "symfony/polyfill-php85": "^1.32",
         "symfony/filesystem": "^7.1|^8.0",
         "symfony/finder": "^6.4|^7.0|^8.0",
         "symfony/routing": "^6.4|^7.0|^8.0"
diff --git a/src/Symfony/Component/ErrorHandler/ErrorHandler.php b/src/Symfony/Component/ErrorHandler/ErrorHandler.php
@@ -116,11 +116,12 @@ public static function register(?self $handler = null, bool $replace = true): se
             $handler = new static();
         }
 
-        if (null === $prev = set_error_handler([$handler, 'handleError'])) {
-            restore_error_handler();
+        if (null === $prev = get_error_handler()) {
             // Specifying the error types earlier would expose us to https://bugs.php.net/63206
             set_error_handler([$handler, 'handleError'], $handler->thrownErrors | $handler->loggedErrors);
             $handler->isRoot = true;
+        } else {
+            set_error_handler([$handler, 'handleError']);
         }
 
         if ($handlerIsNew && \is_array($prev) && $prev[0] instanceof self) {
@@ -362,9 +363,8 @@ public function screamAt(int $levels, bool $replace = false): int
     private function reRegister(int $prev): void
     {
         if ($prev !== ($this->thrownErrors | $this->loggedErrors)) {
-            $handler = set_error_handler(static fn () => null);
+            $handler = get_error_handler();
             $handler = \is_array($handler) ? $handler[0] : null;
-            restore_error_handler();
             if ($handler === $this) {
                 restore_error_handler();
                 if ($this->isRoot) {
diff --git a/src/Symfony/Component/ErrorHandler/composer.json b/src/Symfony/Component/ErrorHandler/composer.json
@@ -18,6 +18,7 @@
     "require": {
         "php": ">=8.2",
         "psr/log": "^1|^2|^3",
+        "symfony/polyfill-php85": "^1.32",
         "symfony/var-dumper": "^6.4|^7.0|^8.0"
     },
     "require-dev": {

Original file line number	Diff line number	Diff line change
`@@ -103,8 +103,7 @@ public function boot(): void`
`103`	`103`	`$_ENV['DOCTRINE_DEPRECATIONS'] = $_SERVER['DOCTRINE_DEPRECATIONS'] ??= 'trigger';`
`104`	`104`
`105`	`105`	`if (class_exists(SymfonyRuntime::class)) {`
`106`		`- $handler = set_error_handler('var_dump');`
`107`		`- restore_error_handler();`
	`106`	`+ $handler = get_error_handler();`
`108`	`107`	`} else {`
`109`	`108`	`$handler = [ErrorHandler::register(null, false)];`
`110`	`109`	`}`