[Console] Avoid extra blank lines when rendering exceptions

2015-12-17 00:26:14 +01:00 · 2015-12-17 00:26:14 +01:00 · 2e158df2c7
commit 2e158df2c7
parent b23c9a3b5b
9 changed files with 3 additions and 38 deletions
--- a/src/Symfony/Component/Console/Application.php
+++ b/src/Symfony/Component/Console/Application.php
@ -673,6 +673,8 @@ class Application
     */
    public function renderException($e, $output)
    {
+        $output->writeln('');
+
        do {
            $title = sprintf('  [%s]  ', get_class($e));

@ -695,7 +697,7 @@ class Application
                }
            }

-            $messages = array('', '');
+            $messages = array();
            $messages[] = $emptyLine = $formatter->format(sprintf('<error>%s</error>', str_repeat(' ', $len)));
            $messages[] = $formatter->format(sprintf('<error>%s%s</error>', $title, str_repeat(' ', max(0, $len - $this->stringWidth($title)))));
            foreach ($lines as $line) {
@ -703,7 +705,6 @@ class Application
            }
            $messages[] = $emptyLine;
            $messages[] = '';
-            $messages[] = '';

            $output->writeln($messages, OutputInterface::OUTPUT_RAW);

@ -730,14 +731,12 @@ class Application
                }

                $output->writeln('');
-                $output->writeln('');
            }
        } while ($e = $e->getPrevious());

        if (null !== $this->runningCommand) {
            $output->writeln(sprintf('<info>%s</info>', sprintf($this->runningCommand->getSynopsis(), $this->getName())));
            $output->writeln('');
-            $output->writeln('');
        }
    }

--- a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception1.txt
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception1.txt
@ -1,8 +1,6 @@

-
                                 
  [InvalidArgumentException]     
  Command "foo" is not defined.  
                                 

-
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt
@ -1,11 +1,8 @@

-
                                      
  [InvalidArgumentException]          
  The "--foo" option does not exist.  
                                      

-
 list [--xml] [--raw] [--format="..."] [namespace]

-
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception3.txt
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception3.txt
@ -1,27 +1,18 @@

-
                           
  [Exception]              
  Third exception comment  
                           

-
-
-
                            
  [Exception]               
  Second exception comment  
                            

-
-
-
                                       
  [Exception]                          
  First exception <p>this is html</p>  
                                       

-
 foo3:bar

-
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception3decorated.txt
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception3decorated.txt
@ -1,27 +1,18 @@

-
 [37;41m                           [0m
 [37;41m  [Exception]              [0m
 [37;41m  Third exception [0m[34;41mcomment[0m[37;41m  [0m
 [37;41m                           [0m

-
-
-
 [37;41m                            [0m
 [37;41m  [Exception]               [0m
 [37;41m  Second exception [0m[33mcomment[0m[37;41m  [0m
 [37;41m                            [0m

-
-
-
 [37;41m                                       [0m
 [37;41m  [Exception]                          [0m
 [37;41m  First exception [0m[37;41m<p>[0m[37;41mthis is html[0m[37;41m</p>[0m[37;41m  [0m
 [37;41m                                       [0m

-
 [32mfoo3:bar[0m

-
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception4.txt
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception4.txt
@ -1,9 +1,7 @@

-
                               
  [InvalidArgumentException]   
  Command "foo" is not define  
  d.                           
                               

-
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth1.txt
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth1.txt
@ -1,11 +1,8 @@

-
                    
  [Exception]       
  エラーメッセージ  
                    

-
 foo

-
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth1decorated.txt
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth1decorated.txt
@ -1,11 +1,8 @@

-
 [37;41m                    [0m
 [37;41m  [Exception]       [0m
 [37;41m  エラーメッセージ  [0m
 [37;41m                    [0m

-
 [32mfoo[0m

-
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth2.txt
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth2.txt
@ -1,12 +1,9 @@

-
                              
  [Exception]                 
  コマンドの実行中にエラーが  
  発生しました。              
                              

-
 foo

-