[Console] Fix for block() padding formatting after symfony#19189

chalasr · chalasr · commit d9fae255fbbc · 2016-06-30T20:07:55.000+02:00
diff --git a/src/Symfony/Component/Console/Style/SymfonyStyle.php b/src/Symfony/Component/Console/Style/SymfonyStyle.php
@@ -410,9 +410,16 @@ private function createBlock($messages, $type = null, $style = null, $prefix = '
             }
         }
 
+        $firstLineIndex = 0;
+        if ($padding && $this->isDecorated()) {
+            $firstLineIndex = 1;
+            array_unshift($lines, '');
+            $lines[] = '';
+        }
+
         foreach ($lines as $i => &$line) {
             if (null !== $type) {
-                $line = 0 === $i ? $type.$line : $lineIndentation.$line;
+                $line = $firstLineIndex === $i ? $type.$line : $lineIndentation.$line;
             }
 
             $line = $prefix.$line;
@@ -423,11 +430,6 @@ private function createBlock($messages, $type = null, $style = null, $prefix = '
             }
         }
 
-        if ($padding && $this->isDecorated()) {
-            array_unshift($lines, '');
-            $lines[] = '';
-        }
-
         return $lines;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -410,9 +410,16 @@ private function createBlock($messages, $type = null, $style = null, $prefix = '`
`410`	`410`	`}`
`411`	`411`	`}`
`412`	`412`
	`413`	`+ $firstLineIndex = 0;`
	`414`	`+ if ($padding && $this->isDecorated()) {`
	`415`	`+ $firstLineIndex = 1;`
	`416`	`+ array_unshift($lines, '');`
	`417`	`+ $lines[] = '';`
	`418`	`+ }`
	`419`	`+`
`413`	`420`	`foreach ($lines as $i => &$line) {`
`414`	`421`	`if (null !== $type) {`
`415`		`- $line = 0 === $i ? $type.$line : $lineIndentation.$line;`
	`422`	`+ $line = $firstLineIndex === $i ? $type.$line : $lineIndentation.$line;`
`416`	`423`	`}`
`417`	`424`
`418`	`425`	`$line = $prefix.$line;`
`@@ -423,11 +430,6 @@ private function createBlock($messages, $type = null, $style = null, $prefix = '`
`423`	`430`	`}`
`424`	`431`	`}`
`425`	`432`
`426`		`- if ($padding && $this->isDecorated()) {`
`427`		`- array_unshift($lines, '');`
`428`		`- $lines[] = '';`
`429`		`- }`
`430`		`-`
`431`	`433`	`return $lines;`
`432`	`434`	`}`
`433`	`435`	`}`