[HttpKernel] fixed a regression when no exception listeners are registered

fabpot · fabpot · commit 27930fb62621 · 2015-04-11T10:15:54.000+02:00
diff --git a/src/Symfony/Component/HttpKernel/HttpKernel.php b/src/Symfony/Component/HttpKernel/HttpKernel.php
@@ -229,7 +229,11 @@ private function handleException(\Exception $e, $request, $type)
         if (!$event->hasResponse()) {
             $this->finishRequest($request, $type);
 
-            throw new \LogicException('No listeners of the "kernel.exception" event set a Response', 0, $e);
+            if ($this->dispatcher->hasListeners(KernelEvents::EXCEPTION)) {
+                throw new \LogicException('No listeners of the "kernel.exception" event set a Response', 0, $e);
+            }
+
+            throw $e;
         }
 
         $response = $event->getResponse();
diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ContainerAwareHttpKernelTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ContainerAwareHttpKernelTest.php
@@ -102,8 +102,8 @@ public function testHandleRestoresThePreviousRequestOnException($type)
             $this->fail('->handle() suppresses the controller exception');
         } catch (\PHPUnit_Framework_Exception $exception) {
             throw $exception;
-        } catch (\LogicException $actual) {
-            $this->assertSame($expected, $actual->getPrevious(), '->handle() throws the controller exception, wrapped when no listener');
+        } catch (\Exception $actual) {
+            $this->assertSame($expected, $actual, '->handle() throws the controller exception');
         }
     }
 
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php
@@ -23,17 +23,14 @@
 
 class HttpKernelTest extends \PHPUnit_Framework_TestCase
 {
+    /**
+     * @expectedException \RuntimeException
+     */
     public function testHandleWhenControllerThrowsAnExceptionAndCatchIsTrue()
     {
-        $exception = new \RuntimeException();
-        $kernel = new HttpKernel(new EventDispatcher(), $this->getResolver(function () use ($exception) { throw $exception; }));
+        $kernel = new HttpKernel(new EventDispatcher(), $this->getResolver(function () { throw new \RuntimeException(); }));
 
-        try {
-            $kernel->handle(new Request(), HttpKernelInterface::MASTER_REQUEST, true);
-            $this->fail('LogicException expected');
-        } catch (\LogicException $e) {
-            $this->assertSame($exception, $e->getPrevious());
-        }
+        $kernel->handle(new Request(), HttpKernelInterface::MASTER_REQUEST, true);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -102,8 +102,8 @@ public function testHandleRestoresThePreviousRequestOnException($type)`
`102`	`102`	`$this->fail('->handle() suppresses the controller exception');`
`103`	`103`	`} catch (\PHPUnit_Framework_Exception $exception) {`
`104`	`104`	`throw $exception;`
`105`		`- } catch (\LogicException $actual) {`
`106`		`- $this->assertSame($expected, $actual->getPrevious(), '->handle() throws the controller exception, wrapped when no listener');`
	`105`	`+ } catch (\Exception $actual) {`
	`106`	`+ $this->assertSame($expected, $actual, '->handle() throws the controller exception');`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`