bug #15515 [Console] Fixed warning when command alias is longer than command name (dosten)

fabpot · fabpot · commit f1d588512f52 · 2015-08-12T13:21:35.000+02:00
This PR was merged into the 2.7 branch. Discussion ---------- [Console] Fixed warning when command alias is longer than command name | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #15511 | License | MIT Commits ------- ecfe944 Fixed warning when command alias is longer than command name
diff --git a/src/Symfony/Component/Console/Descriptor/TextDescriptor.php b/src/Symfony/Component/Console/Descriptor/TextDescriptor.php
@@ -249,12 +249,16 @@ private function formatDefaultValue($default)
      */
     private function getColumnWidth(array $commands)
     {
-        $width = 0;
+        $widths = array();
+
         foreach ($commands as $command) {
-            $width = strlen($command->getName()) > $width ? strlen($command->getName()) : $width;
+            $widths[] = strlen($command->getName());
+            foreach ($command->getAliases() as $alias) {
+                $widths[] = strlen($alias);
+            }
         }
 
-        return $width + 2;
+        return max($widths) + 2;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -249,12 +249,16 @@ private function formatDefaultValue($default)`
`249`	`249`	`*/`
`250`	`250`	`private function getColumnWidth(array $commands)`
`251`	`251`	`{`
`252`		`- $width = 0;`
	`252`	`+ $widths = array();`
	`253`	`+`
`253`	`254`	`foreach ($commands as $command) {`
`254`		`- $width = strlen($command->getName()) > $width ? strlen($command->getName()) : $width;`
	`255`	`+ $widths[] = strlen($command->getName());`
	`256`	`+ foreach ($command->getAliases() as $alias) {`
	`257`	`+ $widths[] = strlen($alias);`
	`258`	`+ }`
`255`	`259`	`}`
`256`	`260`
`257`		`- return $width + 2;`
	`261`	`+ return max($widths) + 2;`
`258`	`262`	`}`
`259`	`263`
`260`	`264`	`/**`