bug #14283 [2.7][Console] Count the $messages array instead of $message (barryvdh)

fabpot · fabpot · commit 6c721658e757 · 2015-04-10T17:31:32.000+02:00
This PR was squashed before being merged into the 2.7 branch (closes #14283). Discussion ---------- [2.7][Console] Count the $messages array instead of $message | Q | A | ------------- | --- | Bug fix? | [yes] | New feature? | [no] | BC breaks? | [no] | Deprecations? | [no] | Tests pass? | [yes] | Fixed tickets | n/a | License | MIT I think you mean $messages instead of $message. With this patch, the number of messages is correctly counted. Commits ------- 95aa167 [2.7][Console] Count the array instead of
diff --git a/src/Symfony/Component/Console/Style/SymfonyStyle.php b/src/Symfony/Component/Console/Style/SymfonyStyle.php
@@ -73,7 +73,7 @@ public function block($messages, $type = null, $style = null, $prefix = ' ', $pa
             $message = OutputFormatter::escape($message);
             $lines = array_merge($lines, explode("\n", wordwrap($message, $this->lineLength - Helper::strlen($prefix))));
 
-            if (count($messages) > 1 && $key < count($message)) {
+            if (count($messages) > 1 && $key < count($messages) - 1) {
                 $lines[] = '';
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public function block($messages, $type = null, $style = null, $prefix = ' ', $pa`
`73`	`73`	`$message = OutputFormatter::escape($message);`
`74`	`74`	`$lines = array_merge($lines, explode("\n", wordwrap($message, $this->lineLength - Helper::strlen($prefix))));`
`75`	`75`
`76`		`- if (count($messages) > 1 && $key < count($message)) {`
	`76`	`+ if (count($messages) > 1 && $key < count($messages) - 1) {`
`77`	`77`	`$lines[] = '';`
`78`	`78`	`}`
`79`	`79`	`}`