From 63cd219a5c5339218c73485d9ebe9fc6ff55ec14 Mon Sep 17 00:00:00 2001
From: Robin Chalas <robin.chalas@elao.com>
Date: Sun, 25 Nov 2018 16:28:24 +0100
Subject: [PATCH] =?UTF-8?q?[Console]=C2=A0Move=20back=20root=20exception?=
 =?UTF-8?q?=20to=20stack=20trace=20in=20verbose=20mode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Symfony/Component/Console/Application.php      |  7 +++++++
 .../Component/Console/Tests/ApplicationTest.php    | 14 ++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
index 1d415636fc..6800360410 100644
--- a/src/Symfony/Component/Console/Application.php
+++ b/src/Symfony/Component/Console/Application.php
@@ -783,6 +783,13 @@ class Application
                 // exception related properties
                 $trace = $e->getTrace();
 
+                array_unshift($trace, array(
+                    'function' => '',
+                    'file' => $e->getFile() ?: 'n/a',
+                    'line' => $e->getLine() ?: 'n/a',
+                    'args' => array(),
+                ));
+
                 for ($i = 0, $count = \count($trace); $i < $count; ++$i) {
                     $class = isset($trace[$i]['class']) ? $trace[$i]['class'] : '';
                     $type = isset($trace[$i]['type']) ? $trace[$i]['type'] : '';
diff --git a/src/Symfony/Component/Console/Tests/ApplicationTest.php b/src/Symfony/Component/Console/Tests/ApplicationTest.php
index faa98e5f5f..7922ce273b 100644
--- a/src/Symfony/Component/Console/Tests/ApplicationTest.php
+++ b/src/Symfony/Component/Console/Tests/ApplicationTest.php
@@ -776,6 +776,20 @@ class ApplicationTest extends TestCase
         $this->assertStringMatchesFormatFile(self::$fixturesPath.'/application_renderexception_linebreaks.txt', $tester->getDisplay(true), '->renderException() keep multiple line breaks');
     }
 
+    public function testRenderExceptionStackTraceContainsRootException()
+    {
+        $application = new Application();
+        $application->setAutoExit(false);
+        $application->register('foo')->setCode(function () {
+            throw new \Exception('Verbose exception');
+        });
+
+        $tester = new ApplicationTester($application);
+        $tester->run(array('command' => 'foo'), array('decorated' => false, 'verbosity' => Output::VERBOSITY_VERBOSE));
+
+        $this->assertContains(sprintf('() at %s:', __FILE__), $tester->getDisplay());
+    }
+
     public function testRun()
     {
         $application = new Application();