[Debug] cleanup interfaces before 2.5-final

Author: nicolas-grekas

EventListener/DebugHandlersListener.php

@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel\EventListener;
+
+use Symfony\Component\Debug\ExceptionHandler;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpKernel\KernelEvents;
+
+/**
+ * Configures the ExceptionHandler.
+ *
+ * @author Nicolas Grekas <[email protected]>
+ */
+class DebugHandlersListener implements EventSubscriberInterface
+{
+    private $exceptionHandler;
+
+    public function __construct($exceptionHandler)
+    {
+        if (is_callable($exceptionHandler)) {
+            $this->exceptionHandler = $exceptionHandler;
+        }
+    }
+
+    public function configure()
+    {
+        if ($this->exceptionHandler) {
+            $mainHandler = set_exception_handler('var_dump');
+            restore_exception_handler();
+            if ($mainHandler instanceof ExceptionHandler) {
+                $mainHandler->setHandler($this->exceptionHandler);
+            }
+            $this->exceptionHandler = null;
+        }
+    }
+
+    public static function getSubscribedEvents()
+    {
+        return array(KernelEvents::REQUEST => array('configure', 2048));
+    }
+}

EventListener/FatalErrorExceptionsListener.php

@@ -25,7 +25,6 @@
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\Debug\Exception\FatalErrorException;
 
 /**
  * HttpKernel notifies events to convert a Request object to a Response one.
@@ -87,11 +86,16 @@ public function terminate(Request $request, Response $response)
     }
 
     /**
+     * @throws \LogicException If the request stack is empty
+     *
      * @internal
      */
-    public function handleFatalErrorException(FatalErrorException $exception)
+    public function terminateWithException(\Exception $exception)
     {
-        $request = $this->requestStack->getMasterRequest();
+        if (!$request = $this->requestStack->getMasterRequest()) {
+            throw new \LogicException('Request stack is empty', 0, $exception);
+        }
+
         $response = $this->handleException($exception, $request, self::MASTER_REQUEST);
 
         $response->sendHeaders();