bug #17040 [Console] Avoid extra blank lines when rendering exception…

…s (ogizanagi) This PR was merged into the 2.3 branch. Discussion ---------- [Console] Avoid extra blank lines when rendering exceptions | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Don't know if it can be considered as a bug fix as it is the behavior since a while (#9055), but I let you see by yourself the old vs new rendering: ![Console exception rendering](https://cloud.githubusercontent.com/assets/2211145/11857447/92cebfbe-a458-11e5-9d3d-6147b0338080.PNG) Commits ------- 2e158df [Console] Avoid extra blank lines when rendering exceptions
symfony · Dec 18, 2015 · f371445 · f371445
2 parents 68bd2c1 + 2e158df
commit f371445
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 38 deletions.
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
@@ -673,6 +673,8 @@ public function asXml($namespace = null, $asDom = false)
      */
     public function renderException($e, $output)
     {
+        $output->writeln('');
+
         do {
             $title = sprintf('  [%s]  ', get_class($e));
 
@@ -695,15 +697,14 @@ public function renderException($e, $output)
                 }
             }
 
-            $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) {
                 $messages[] = $formatter->format(sprintf('<error>  %s  %s</error>', $line[0], str_repeat(' ', $len - $line[1])));
             }
             $messages[] = $emptyLine;
             $messages[] = '';
-            $messages[] = '';
 
             $output->writeln($messages, OutputInterface::OUTPUT_RAW);
 
@@ -730,14 +731,12 @@ public function renderException($e, $output)
                 }
 
                 $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('');
         }
     }
 

diff --git 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.  
 
 
-
diff --git 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]
 
-
diff --git 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
 
-
diff --git 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
 
-
diff --git 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.                           
 
 
-
diff --git 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
 
-
diff --git a/...ny/Component/Console/Tests/Fixtures/application_renderexception_doublewidth1decorated.txt b/...ny/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
 
-
diff --git 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
 
-