symfony
diff --git a/‎src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php
+4-9Lines changed: 4 additions & 9 deletions b/‎src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php
+4-9Lines changed: 4 additions & 9 deletions
diff --git a/‎src/Symfony/Component/HttpKernel/HttpKernel.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/HttpKernel.php
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/HttpKernel/HttpKernel.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/HttpKernel.php
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ContainerAwareHttpKernelTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ContainerAwareHttpKernelTest.php
+2-2Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ContainerAwareHttpKernelTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ContainerAwareHttpKernelTest.php
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php
+10-7Lines changed: 10 additions & 7 deletions b/‎src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php
+10-7Lines changed: 10 additions & 7 deletions
@@ -83,20 +83,15 @@ public static function getSubscribedEvents()
      *
      * @param \Exception $exception The \Exception instance
      * @param string     $message   The error message to log
-     * @param bool       $original  False when the handling of the exception thrown another exception
      */
-    protected function logException(\Exception $exception, $message, $original = true)
+    protected function logException(\Exception $exception, $message)
     {
-        $isCritical = !$exception instanceof HttpExceptionInterface || $exception->getStatusCode() >= 500;
-        $context = array('exception' => $exception);
         if (null !== $this->logger) {
-            if ($isCritical) {
-                $this->logger->critical($message, $context);
+            if (!$exception instanceof HttpExceptionInterface || $exception->getStatusCode() >= 500) {
+                $this->logger->critical($message, array('exception' => $exception));
             } else {
-                $this->logger->error($message, $context);
+                $this->logger->error($message, array('exception' => $exception));
             }
-        } elseif (!$original || $isCritical) {
-            error_log($message);
         }
     }
 
 
@@ -229,7 +229,7 @@ private function handleException(\Exception $e, $request, $type)
         if (!$event->hasResponse()) {
             $this->finishRequest($request, $type);
 
-            throw $e;
+            throw new \LogicException('No listeners of the "kernel.exception" event set a Response', 0, $e);
         }
 
         $response = $event->getResponse();
 
@@ -102,8 +102,8 @@ public function testHandleRestoresThePreviousRequestOnException($type)
             $this->fail('->handle() suppresses the controller exception');
         } catch (\PHPUnit_Framework_Exception $exception) {
             throw $exception;
-        } catch (\Exception $actual) {
-            $this->assertSame($expected, $actual, '->handle() throws the controller exception');
+        } catch (\LogicException $actual) {
+            $this->assertSame($expected, $actual->getPrevious(), '->handle() throws the controller exception, wrapped when no listener');
         }
     }
 
 
@@ -23,14 +23,17 @@
 
 class HttpKernelTest extends \PHPUnit_Framework_TestCase
 {
-    /**
-     * @expectedException \RuntimeException
-     */
     public function testHandleWhenControllerThrowsAnExceptionAndRawIsTrue()
     {
-        $kernel = new HttpKernel(new EventDispatcher(), $this->getResolver(function () { throw new \RuntimeException(); }));
-
-        $kernel->handle(new Request(), HttpKernelInterface::MASTER_REQUEST, true);
+        $exception = new \RuntimeException();
+        $kernel = new HttpKernel(new EventDispatcher(), $this->getResolver(function () use ($exception) { throw $exception; }));
+
+        try {
+            $kernel->handle(new Request(), HttpKernelInterface::MASTER_REQUEST, true);
+            $this->fail('LogicException expected');
+        } catch (\LogicException $e) {
+            $this->assertSame($exception, $e->getPrevious());
+        }
     }
 
     /**
@@ -132,7 +135,7 @@ public function testHandleWhenNoControllerIsFound()
         $dispatcher = new EventDispatcher();
         $kernel = new HttpKernel($dispatcher, $this->getResolver(false));
 
-        $kernel->handle(new Request());
+        $kernel->handle(new Request(), HttpKernelInterface::MASTER_REQUEST, false);
     }
 
     /**
Original file line number	Diff line number	Diff line change
`@@ -83,20 +83,15 @@ public static function getSubscribedEvents()`
`83`	`83`	`*`
`84`	`84`	`* @param \Exception $exception The \Exception instance`
`85`	`85`	`* @param string $message The error message to log`
`86`		`- * @param bool $original False when the handling of the exception thrown another exception`
`87`	`86`	`*/`
`88`		`- protected function logException(\Exception $exception, $message, $original = true)`
	`87`	`+ protected function logException(\Exception $exception, $message)`
`89`	`88`	`{`
`90`		`- $isCritical = !$exception instanceof HttpExceptionInterface \|\| $exception->getStatusCode() >= 500;`
`91`		`- $context = array('exception' => $exception);`
`92`	`89`	`if (null !== $this->logger) {`
`93`		`- if ($isCritical) {`
`94`		`- $this->logger->critical($message, $context);`
	`90`	`+ if (!$exception instanceof HttpExceptionInterface \|\| $exception->getStatusCode() >= 500) {`
	`91`	`+ $this->logger->critical($message, array('exception' => $exception));`
`95`	`92`	`} else {`
`96`		`- $this->logger->error($message, $context);`
	`93`	`+ $this->logger->error($message, array('exception' => $exception));`
`97`	`94`	`}`
`98`		`- } elseif (!$original \|\| $isCritical) {`
`99`		`- error_log($message);`
`100`	`95`	`}`
`101`	`96`	`}`
`102`	`97`
Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,7 @@ private function handleException(\Exception $e, $request, $type)`
`229`	`229`	`if (!$event->hasResponse()) {`
`230`	`230`	`$this->finishRequest($request, $type);`
`231`	`231`
`232`		`- throw $e;`
	`232`	`+ throw new \LogicException('No listeners of the "kernel.exception" event set a Response', 0, $e);`
`233`	`233`	`}`
`234`	`234`
`235`	`235`	`$response = $event->getResponse();`
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 (\Exception $actual) {`
`106`		`- $this->assertSame($expected, $actual, '->handle() throws the controller exception');`
	`105`	`+ } catch (\LogicException $actual) {`
	`106`	`+ $this->assertSame($expected, $actual->getPrevious(), '->handle() throws the controller exception, wrapped when no listener');`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`