[HttpKernel] Configure the ErrorHandler even when it is overriden

nicolas-grekas · nicolas-grekas · commit b292aa2d3441 · 2021-01-22T18:03:04.000+01:00
diff --git a/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php b/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php
@@ -33,6 +33,7 @@
  */
 class DebugHandlersListener implements EventSubscriberInterface
 {
+    private $earlyHandler;
     private $exceptionHandler;
     private $logger;
     private $levels;
@@ -53,6 +54,10 @@ class DebugHandlersListener implements EventSubscriberInterface
      */
     public function __construct(callable $exceptionHandler = null, LoggerInterface $logger = null, $levels = \E_ALL, ?int $throwAt = \E_ALL, bool $scream = true, $fileLinkFormat = null, bool $scope = true)
     {
+        $handler = set_exception_handler('var_dump');
+        $this->earlyHandler = \is_array($handler) ? $handler[0] : null;
+        restore_exception_handler();
+
         $this->exceptionHandler = $exceptionHandler;
         $this->logger = $logger;
         $this->levels = null === $levels ? \E_ALL : $levels;
@@ -73,12 +78,26 @@ public function configure(Event $event = null)
         if (!$event instanceof KernelEvent ? !$this->firstCall : !$event->isMasterRequest()) {
             return;
         }
-        $this->firstCall = $this->hasTerminatedWithException = false;
 
         $handler = set_exception_handler('var_dump');
         $handler = \is_array($handler) ? $handler[0] : null;
         restore_exception_handler();
 
+        if (!$handler instanceof ErrorHandler && !$handler instanceof LegacyErrorHandler) {
+            $handler = $this->earlyHandler;
+        }
+
+        if ($handler !== $this->earlyHandler) {
+            set_exception_handler('var_dump');
+            try {
+                $this->configure($event);
+            } finally {
+                restore_exception_handler();
+            }
+        }
+
+        $this->firstCall = $this->hasTerminatedWithException = false;
+
         if ($this->logger || null !== $this->throwAt) {
             if ($handler instanceof ErrorHandler || $handler instanceof LegacyErrorHandler) {
                 if ($this->logger) {
