[HttpKernel] avoid hidding exceptions set in exception listeners (see the Security ExceptionListener for some examples)

fabpot · fabpot · commit 295860dfaf47 · 2012-07-13T11:25:52.000+02:00
diff --git a/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php b/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php
@@ -90,7 +90,7 @@ public function onKernelException(GetResponseForExceptionEvent $event)
             $handling = false;
 
             // re-throw the exception as this is a catch-all
-            throw $exception;
+            return;
         }
 
         $event->setResponse($response);
diff --git a/src/Symfony/Component/HttpKernel/HttpKernel.php b/src/Symfony/Component/HttpKernel/HttpKernel.php
@@ -184,6 +184,9 @@ private function handleException(\Exception $e, $request, $type)
         $event = new GetResponseForExceptionEvent($this, $request, $type, $e);
         $this->dispatcher->dispatch(KernelEvents::EXCEPTION, $event);
 
+        // a listener might have replaced the exception
+        $e = $event->getException();
+
         if (!$event->hasResponse()) {
             throw $e;
         }

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ public function onKernelException(GetResponseForExceptionEvent $event)`
`90`	`90`	`$handling = false;`
`91`	`91`
`92`	`92`	`// re-throw the exception as this is a catch-all`
`93`		`- throw $exception;`
	`93`	`+ return;`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`$event->setResponse($response);`
Original file line number	Diff line number	Diff line change
`@@ -184,6 +184,9 @@ private function handleException(\Exception $e, $request, $type)`
`184`	`184`	`$event = new GetResponseForExceptionEvent($this, $request, $type, $e);`
`185`	`185`	`$this->dispatcher->dispatch(KernelEvents::EXCEPTION, $event);`
`186`	`186`
	`187`	`+ // a listener might have replaced the exception`
	`188`	`+ $e = $event->getException();`
	`189`	`+`
`187`	`190`	`if (!$event->hasResponse()) {`
`188`	`191`	`throw $e;`
`189`	`192`	`}`