[Console] fixed previous merge

symfony · Dec 18, 2011 · 3f4d718 · 3f4d718
1 parent a13d227
commit 3f4d718
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 11 deletions.
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
@@ -626,17 +626,30 @@ static public function getAbbreviations($names)
     /**
      * Returns a text representation of the Application.
      *
-     * @param string $namespace An optional namespace name
-     * @param boolean $raw Whether to return raw command list
+     * @param string  $namespace An optional namespace name
+     * @param boolean $raw       Whether to return raw command list
      *
      * @return string A string representing the Application
      */
     public function asText($namespace = null, $raw = false)
     {
         $commands = $namespace ? $this->all($this->findNamespace($namespace)) : $this->commands;
-
+
+        $width = 0;
+        foreach ($commands as $command) {
+            $width = strlen($command->getName()) > $width ? strlen($command->getName()) : $width;
+        }
+        $width += 2;
+
         if ($raw) {
-            return array_keys($commands);
+            $messages = array();
+            foreach ($this->sortCommands($commands) as $space => $commands) {
+                foreach ($commands as $name => $command) {
+                    $messages[] = sprintf("%-${width}s %s", $name, $command->getDescription());
+                }
+            }
+
+            return implode("\n", $messages);
         }
 
         $messages = array($this->getHelp(), '');
@@ -646,12 +659,6 @@ public function asText($namespace = null, $raw = false)
             $messages[] = '<comment>Available commands:</comment>';
         }
 
-        $width = 0;
-        foreach ($commands as $command) {
-            $width = strlen($command->getName()) > $width ? strlen($command->getName()) : $width;
-        }
-        $width += 2;
-
         // add commands by namespace
         foreach ($this->sortCommands($commands) as $space => $commands) {
             if (!$namespace && '_global' !== $space) {

diff --git a/tests/Symfony/Tests/Component/Console/Command/ListCommandTest.php b/tests/Symfony/Tests/Component/Console/Command/ListCommandTest.php
@@ -28,6 +28,11 @@ public function testExecute()
         $this->assertRegExp('/<command id="list" name="list">/', $commandTester->getDisplay(), '->execute() returns a list of available commands in XML if --xml is passed');
 
         $commandTester->execute(array('command' => $command->getName(), '--raw' => true));
-        $this->assertRegExp('/help\n/', $commandTester->getDisplay(), 'boo');
+        $output = <<<EOF
+help   Displays help for a command
+list   Lists commands
+
+EOF;
+        $this->assertEquals($output, $commandTester->getDisplay(), 'boo');
     }
 }