Merge branch '5.4' into 6.4

* 5.4:
  Tweak error/exception handler registration

Author: nicolas-grekas

src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php

@@ -58,6 +58,7 @@
 use Symfony\Component\PropertyInfo\DependencyInjection\PropertyInfoPass;
 use Symfony\Component\Routing\DependencyInjection\AddExpressionLanguageProvidersPass;
 use Symfony\Component\Routing\DependencyInjection\RoutingResolverPass;
+use Symfony\Component\Runtime\SymfonyRuntime;
 use Symfony\Component\Scheduler\DependencyInjection\AddScheduleMessengerPass;
 use Symfony\Component\Serializer\DependencyInjection\SerializerPass;
 use Symfony\Component\Translation\DependencyInjection\DataCollectorTranslatorPass;
@@ -99,13 +100,19 @@ public function boot()
     {
         $_ENV['DOCTRINE_DEPRECATIONS'] = $_SERVER['DOCTRINE_DEPRECATIONS'] ??= 'trigger';
 
-        $handler = ErrorHandler::register(null, false);
+        if (class_exists(SymfonyRuntime::class)) {
+            $handler = set_error_handler('var_dump');
+            restore_error_handler();
+        } else {
+            $handler = [ErrorHandler::register(null, false)];
+        }
 
-        // When upgrading an existing Symfony application from 6.2 to 6.3, and
-        // the cache is warmed up, the service is not available yet, so we need
-        // to check if it exists.
-        if ($this->container->has('debug.error_handler_configurator')) {
-            $this->container->get('debug.error_handler_configurator')->configure($handler);
+        if (!$this->container->has('debug.error_handler_configurator')) {
+            // When upgrading an existing Symfony application from 6.2 to 6.3, and
+            // the cache is warmed up, the service is not available yet, so we need
+            // to check if it exists.
+        } elseif (\is_array($handler) && $handler[0] instanceof ErrorHandler) {
+            $this->container->get('debug.error_handler_configurator')->configure($handler[0]);
         }
 
         if ($this->container->getParameter('kernel.http_method_override')) {

src/Symfony/Bundle/FrameworkBundle/composer.json

@@ -93,6 +93,7 @@
         "symfony/mime": "<6.4",
         "symfony/property-info": "<5.4",
         "symfony/property-access": "<5.4",
+        "symfony/runtime": "<5.4.45|>=6.0,<6.4.13|>=7.0,<7.1.6",
         "symfony/scheduler": "<6.4.4|>=7.0.0,<7.0.4",
         "symfony/serializer": "<6.4",
         "symfony/security-csrf": "<5.4",

src/Symfony/Component/Console/Application.php

@@ -169,9 +169,9 @@ public function run(?InputInterface $input = null, ?OutputInterface $output = nu
             }
         }
 
-        $this->configureIO($input, $output);
-
         try {
+            $this->configureIO($input, $output);
+
             $exitCode = $this->doRun($input, $output);
         } catch (\Throwable $e) {
             if ($e instanceof \Exception && !$this->catchExceptions) {

src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php

@@ -47,7 +47,8 @@ public function __construct(?callable $exceptionHandler = null, bool|LoggerInter
             // BC with Symfony 5
             $webMode = null;
         }
-        $handler = set_exception_handler('is_int');
+
+        $handler = set_exception_handler('var_dump');
         $this->earlyHandler = \is_array($handler) ? $handler[0] : null;
         restore_exception_handler();
 
@@ -94,7 +95,7 @@ public function configure(?object $event = null): void
             }
         }
         if ($this->exceptionHandler) {
-            $handler = set_exception_handler(static fn () => null);
+            $handler = set_exception_handler('var_dump');
             $handler = \is_array($handler) ? $handler[0] : null;
             restore_exception_handler();
 

src/Symfony/Component/HttpKernel/EventListener/ErrorListener.php

@@ -104,11 +104,11 @@ public function onKernelException(ExceptionEvent $event)
 
         $throwable = $event->getThrowable();
 
-        if ($exceptionHandler = set_exception_handler(var_dump(...))) {
-            restore_exception_handler();
-            if (\is_array($exceptionHandler) && $exceptionHandler[0] instanceof ErrorHandler) {
-                $throwable = $exceptionHandler[0]->enhanceError($event->getThrowable());
-            }
+        $exceptionHandler = set_exception_handler('var_dump');
+        restore_exception_handler();
+
+        if (\is_array($exceptionHandler) && $exceptionHandler[0] instanceof ErrorHandler) {
+            $throwable = $exceptionHandler[0]->enhanceError($event->getThrowable());
         }
 
         $request = $this->duplicateRequest($throwable, $event->getRequest());

src/Symfony/Component/Runtime/GenericRuntime.php

@@ -71,15 +71,15 @@ public function __construct(array $options = [])
         if ($debug) {
             umask(0000);
             $_SERVER[$debugKey] = $_ENV[$debugKey] = '1';
-
-            if (false !== $errorHandler = ($options['error_handler'] ?? BasicErrorHandler::class)) {
-                $errorHandler::register($debug);
-                $options['error_handler'] = false;
-            }
         } else {
             $_SERVER[$debugKey] = $_ENV[$debugKey] = '0';
         }
 
+        if (false !== $errorHandler = ($options['error_handler'] ?? BasicErrorHandler::class)) {
+            $errorHandler::register($debug);
+            $options['error_handler'] = false;
+        }
+
         $this->options = $options;
     }
 

src/Symfony/Component/Runtime/Internal/BasicErrorHandler.php

@@ -30,10 +30,10 @@ public static function register(bool $debug): void
         }
 
         if (0 <= \ini_get('zend.assertions')) {
-            ini_set('zend.assertions', 1);
-            ini_set('assert.active', $debug);
-            ini_set('assert.exception', 1);
+            ini_set('zend.assertions', (int) $debug);
         }
+        ini_set('assert.active', 1);
+        ini_set('assert.exception', 1);
 
         set_error_handler(new self());
     }

src/Symfony/Component/Runtime/Internal/SymfonyErrorHandler.php

@@ -24,12 +24,31 @@ class SymfonyErrorHandler
 {
     public static function register(bool $debug): void
     {
-        BasicErrorHandler::register($debug);
+        if (!class_exists(ErrorHandler::class)) {
+            BasicErrorHandler::register($debug);
 
-        if (class_exists(ErrorHandler::class)) {
+            return;
+        }
+
+        error_reporting(-1);
+
+        if (!\in_array(\PHP_SAPI, ['cli', 'phpdbg', 'embed'], true)) {
+            ini_set('display_errors', $debug);
+        } elseif (!filter_var(\ini_get('log_errors'), \FILTER_VALIDATE_BOOL) || \ini_get('error_log')) {
+            // CLI - display errors only if they're not already logged to STDERR
+            ini_set('display_errors', 1);
+        }
+
+        if (0 <= \ini_get('zend.assertions')) {
+            ini_set('zend.assertions', (int) $debug);
+        }
+        ini_set('assert.active', 1);
+        ini_set('assert.exception', 1);
+
+        if ($debug) {
             DebugClassLoader::enable();
-            restore_error_handler();
-            ErrorHandler::register(new ErrorHandler(new BufferingLogger(), $debug));
         }
+
+        ErrorHandler::register(new ErrorHandler(new BufferingLogger(), $debug));
     }
 }