[Console] Show code when an exception is thrown

maidmaid · fabpot · commit f8cd9e826328 · 2016-01-27T05:55:18.000+01:00
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
@@ -588,7 +588,11 @@ public function renderException(\Exception $e, OutputInterface $output)
         $output->writeln('', OutputInterface::VERBOSITY_QUIET);
 
         do {
-            $title = sprintf('  [%s]  ', get_class($e));
+            $title = sprintf(
+                '  [%s%s]  ',
+                get_class($e),
+                $output->isVerbose() && 0 !== ($code = $e->getCode()) ? ' ('.$code.')' : ''
+            );
 
             $len = $this->stringWidth($title);
 
diff --git a/src/Symfony/Component/Console/Tests/ApplicationTest.php b/src/Symfony/Component/Console/Tests/ApplicationTest.php
@@ -520,6 +520,11 @@ public function testRenderException()
         $tester->run(array('command' => 'foo3:bar'), array('decorated' => false));
         $this->assertStringEqualsFile(self::$fixturesPath.'/application_renderexception3.txt', $tester->getDisplay(true), '->renderException() renders a pretty exceptions with previous exceptions');
 
+        $tester->run(array('command' => 'foo3:bar'), array('decorated' => false, 'verbosity' => Output::VERBOSITY_VERBOSE));
+        $this->assertRegExp('/\[Exception\]\s*First exception/', $tester->getDisplay(), '->renderException() renders a pretty exception without code exception when code exception is default and verbosity is verbose');
+        $this->assertRegExp('/\[Exception\]\s*Second exception/', $tester->getDisplay(), '->renderException() renders a pretty exception without code exception when code exception is 0 and verbosity is verbose');
+        $this->assertRegExp('/\[Exception \(404\)\]\s*Third exception/', $tester->getDisplay(), '->renderException() renders a pretty exception with code exception when code exception is 404 and verbosity is verbose');
+
         $tester->run(array('command' => 'foo3:bar'), array('decorated' => true));
         $this->assertStringEqualsFile(self::$fixturesPath.'/application_renderexception3decorated.txt', $tester->getDisplay(true), '->renderException() renders a pretty exceptions with previous exceptions');
 
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Foo3Command.php b/src/Symfony/Component/Console/Tests/Fixtures/Foo3Command.php
@@ -23,7 +23,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 throw new \Exception('Second exception <comment>comment</comment>', 0, $e);
             }
         } catch (\Exception $e) {
-            throw new \Exception('Third exception <fg=blue;bg=red>comment</>', 0, $e);
+            throw new \Exception('Third exception <fg=blue;bg=red>comment</>', 404, $e);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`23`	`23`	`throw new \Exception('Second exception <comment>comment</comment>', 0, $e);`
`24`	`24`	`}`
`25`	`25`	`} catch (\Exception $e) {`
`26`		`- throw new \Exception('Third exception <fg=blue;bg=red>comment</>', 0, $e);`
	`26`	`+ throw new \Exception('Third exception <fg=blue;bg=red>comment</>', 404, $e);`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`	`}`