[HttpKernel] Embed the original exception as previous to bounced exceptions

nicolas-grekas · nicolas-grekas · commit bb020f4a729b · 2015-04-03T08:20:10.000+02:00
diff --git a/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php b/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php
@@ -62,7 +62,18 @@ public function onKernelException(GetResponseForExceptionEvent $event)
             // set handling to false otherwise it wont be able to handle further more
             $handling = false;
 
-            // throwing $e, not $exception, is on purpose: fixing error handling code paths is the most important
+            $wrapper = $e;
+
+            while ($prev = $wrapper->getPrevious()) {
+                if ($exception === $wrapper = $prev) {
+                    throw $e;
+                }
+            }
+
+            $prev = new \ReflectionProperty('Exception', 'previous');
+            $prev->setAccessible(true);
+            $prev->setValue($wrapper, $exception);
+
             throw $e;
         }
 
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/ExceptionListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/ExceptionListenerTest.php
@@ -57,6 +57,7 @@ public function testHandleWithoutLogger($event, $event2)
             $this->fail('RuntimeException expected');
         } catch (\RuntimeException $e) {
             $this->assertSame('bar', $e->getMessage());
+            $this->assertSame('foo', $e->getPrevious()->getMessage());
         }
     }
 
@@ -77,6 +78,7 @@ public function testHandleWithLogger($event, $event2)
             $this->fail('RuntimeException expected');
         } catch (\RuntimeException $e) {
             $this->assertSame('bar', $e->getMessage());
+            $this->assertSame('foo', $e->getPrevious()->getMessage());
         }
 
         $this->assertEquals(3, $logger->countErrors());

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ public function testHandleWithoutLogger($event, $event2)`
`57`	`57`	`$this->fail('RuntimeException expected');`
`58`	`58`	`} catch (\RuntimeException $e) {`
`59`	`59`	`$this->assertSame('bar', $e->getMessage());`
	`60`	`+ $this->assertSame('foo', $e->getPrevious()->getMessage());`
`60`	`61`	`}`
`61`	`62`	`}`
`62`	`63`
`@@ -77,6 +78,7 @@ public function testHandleWithLogger($event, $event2)`
`77`	`78`	`$this->fail('RuntimeException expected');`
`78`	`79`	`} catch (\RuntimeException $e) {`
`79`	`80`	`$this->assertSame('bar', $e->getMessage());`
	`81`	`+ $this->assertSame('foo', $e->getPrevious()->getMessage());`
`80`	`82`	`}`
`81`	`83`
`82`	`84`	`$this->assertEquals(3, $logger->countErrors());`