symfony
diff --git a/‎src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php
+19-10Lines changed: 19 additions & 10 deletions b/‎src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php
+19-10Lines changed: 19 additions & 10 deletions
diff --git a/‎src/Symfony/Component/HttpKernel/HttpKernel.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/HttpKernel.php
+3-5Lines changed: 3 additions & 5 deletions b/‎src/Symfony/Component/HttpKernel/HttpKernel.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/HttpKernel.php
+3-5Lines changed: 3 additions & 5 deletions
@@ -16,6 +16,7 @@
 use Symfony\Component\Debug\ExceptionHandler;
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\Event\KernelEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\Console\ConsoleEvents;
@@ -36,6 +37,7 @@ class DebugHandlersListener implements EventSubscriberInterface
     private $scream;
     private $fileLinkFormat;
     private $firstCall = true;
+    private $hasTerminatedWithException;
 
     /**
      * @param callable|null        $exceptionHandler A handler that will be called on Exception
@@ -60,14 +62,16 @@ public function __construct($exceptionHandler, LoggerInterface $logger = null, $
      */
     public function configure(Event $event = null)
     {
-        if (!$this->firstCall) {
+        if (!$event instanceof GetResponseEvent ? !$this->firstCall : !$event->getRequest()->isMasterRequest()) {
             return;
         }
-        $this->firstCall = false;
+        $this->firstCall = $this->hasTerminatedWithException = false;
+
+        $handler = set_exception_handler('var_dump');
+        $handler = is_array($handler) ? $handler[0] : null;
+        restore_exception_handler();
+
         if ($this->logger || null !== $this->throwAt) {
-            $handler = set_error_handler('var_dump');
-            $handler = is_array($handler) ? $handler[0] : null;
-            restore_error_handler();
             if ($handler instanceof ErrorHandler) {
                 if ($this->logger) {
                     $handler->setDefaultLogger($this->logger, $this->levels);
@@ -91,8 +95,16 @@ public function configure(Event $event = null)
         }
         if (!$this->exceptionHandler) {
             if ($event instanceof KernelEvent) {
-                if (method_exists($event->getKernel(), 'terminateWithException')) {
-                    $this->exceptionHandler = array($event->getKernel(), 'terminateWithException');
+                if (method_exists($kernel = $event->getKernel(), 'terminateWithException')) {
+                    $request = $event->getRequest();
+                    $hasRun = &$this->hasTerminatedWithException;
+                    $this->exceptionHandler = function (\Exception $e) use ($kernel, $request, &$hasRun) {
+                        if ($hasRun) {
+                            throw $e;
+                        }
+                        $hasRun = true;
+                        $kernel->terminateWithException($e, $request);
+                    };
                 }
             } elseif ($event instanceof ConsoleEvent && $app = $event->getCommand()->getApplication()) {
                 $output = $event->getOutput();
@@ -105,9 +117,6 @@ public function configure(Event $event = null)
             }
         }
         if ($this->exceptionHandler) {
-            $handler = set_exception_handler('var_dump');
-            $handler = is_array($handler) ? $handler[0] : null;
-            restore_exception_handler();
             if ($handler instanceof ErrorHandler) {
                 $h = $handler->setExceptionHandler('var_dump') ?: $this->exceptionHandler;
                 $handler->setExceptionHandler($h);
 
@@ -78,14 +78,12 @@ public function terminate(Request $request, Response $response)
     }
 
     /**
-     * @throws \LogicException If the request stack is empty
-     *
      * @internal
      */
-    public function terminateWithException(\Exception $exception)
+    public function terminateWithException(\Exception $exception, Request $request = null)
     {
-        if (!$request = $this->requestStack->getMasterRequest()) {
-            throw new \LogicException('Request stack is empty', 0, $exception);
+        if (!$request = $request ?: $this->requestStack->getMasterRequest()) {
+            throw $exception;
         }
 
         $response = $this->handleException($exception, $request, self::MASTER_REQUEST);
Original file line number	Diff line number	Diff line change
`@@ -78,14 +78,12 @@ public function terminate(Request $request, Response $response)`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`/**`
`81`		`- * @throws \LogicException If the request stack is empty`
`82`		`- *`
`83`	`81`	`* @internal`
`84`	`82`	`*/`
`85`		`- public function terminateWithException(\Exception $exception)`
	`83`	`+ public function terminateWithException(\Exception $exception, Request $request = null)`
`86`	`84`	`{`
`87`		`- if (!$request = $this->requestStack->getMasterRequest()) {`
`88`		`- throw new \LogicException('Request stack is empty', 0, $exception);`
	`85`	`+ if (!$request = $request ?: $this->requestStack->getMasterRequest()) {`
	`86`	`+ throw $exception;`
`89`	`87`	`}`
`90`	`88`
`91`	`89`	`$response = $this->handleException($exception, $request, self::MASTER_REQUEST);`