Merge branch '2.3' into 2.6

* 2.3:
  [Form] NativeRequestHandler file handling fix
  [HttpKernel] Throw double-bounce exceptions
  minor #13377 [Console] Change greater by greater or equal for isFresh in FileResource
  [2.3] [HttpFoundation] fixed param order for Nginx's x-accel-redirect

Author: nicolas-grekas

EventListener/ExceptionListener.php

@@ -57,13 +57,13 @@ public function onKernelException(GetResponseForExceptionEvent $event)
         try {
             $response = $event->getKernel()->handle($request, HttpKernelInterface::SUB_REQUEST, true);
         } catch (\Exception $e) {
-            $this->logException($exception, sprintf('Exception thrown when handling an exception (%s: %s)', get_class($e), $e->getMessage()), false);
+            $this->logException($e, sprintf('Exception thrown when handling an exception (%s: %s at %s line %s)', get_class($e), $e->getMessage(), $e->getFile(), $e->getLine()), false);
 
             // set handling to false otherwise it wont be able to handle further more
             $handling = false;
 
-            // re-throw the exception from within HttpKernel as this is a catch-all
-            return;
+            // throwing $e, not $exception, is on purpose: fixing error handling code paths is the most important
+            throw $e;
         }
 
         $event->setResponse($response);
@@ -81,7 +81,7 @@ public static function getSubscribedEvents()
     /**
      * Logs an exception.
      *
-     * @param \Exception $exception The original \Exception instance
+     * @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
      */

Tests/EventListener/ExceptionListenerTest.php

@@ -54,8 +54,9 @@ public function testHandleWithoutLogger($event, $event2)
 
         try {
             $l->onKernelException($event2);
-        } catch (\Exception $e) {
-            $this->assertSame('foo', $e->getMessage());
+            $this->fail('RuntimeException expected');
+        } catch (\RuntimeException $e) {
+            $this->assertSame('bar', $e->getMessage());
         }
     }
 
@@ -73,8 +74,9 @@ public function testHandleWithLogger($event, $event2)
 
         try {
             $l->onKernelException($event2);
-        } catch (\Exception $e) {
-            $this->assertSame('foo', $e->getMessage());
+            $this->fail('RuntimeException expected');
+        } catch (\RuntimeException $e) {
+            $this->assertSame('bar', $e->getMessage());
         }
 
         $this->assertEquals(3, $logger->countErrors());
@@ -137,6 +139,6 @@ class TestKernelThatThrowsException implements HttpKernelInterface
 {
     public function handle(Request $request, $type = self::MASTER_REQUEST, $catch = true)
     {
-        throw new \Exception('bar');
+        throw new \RuntimeException('bar');
     }
 }