[console] Use the description when no help is available

Tristan Darricau · Tristan Darricau · commit 641f85918244 · 2015-08-24T15:24:49.000+02:00
diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php
@@ -484,7 +484,7 @@ public function setHelp($help)
      */
     public function getHelp()
     {
-        return $this->help;
+        return $this->help ?: $this->description;
     }
 
     /**
diff --git a/src/Symfony/Component/Console/Tests/Command/CommandTest.php b/src/Symfony/Component/Console/Tests/Command/CommandTest.php
@@ -131,6 +131,8 @@ public function testGetSetHelp()
         $ret = $command->setHelp('help1');
         $this->assertEquals($command, $ret, '->setHelp() implements a fluent interface');
         $this->assertEquals('help1', $command->getHelp(), '->setHelp() sets the help');
+        $command->setHelp(null);
+        $this->assertEquals('description', $command->getHelp(), '->getHelp() fallback to the description');
     }
 
     public function testGetProcessedHelp()

Original file line number	Diff line number	Diff line change
`@@ -484,7 +484,7 @@ public function setHelp($help)`
`484`	`484`	`*/`
`485`	`485`	`public function getHelp()`
`486`	`486`	`{`
`487`		`- return $this->help;`
	`487`	`+ return $this->help ?: $this->description;`
`488`	`488`	`}`
`489`	`489`
`490`	`490`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -131,6 +131,8 @@ public function testGetSetHelp()`
`131`	`131`	`$ret = $command->setHelp('help1');`
`132`	`132`	`$this->assertEquals($command, $ret, '->setHelp() implements a fluent interface');`
`133`	`133`	`$this->assertEquals('help1', $command->getHelp(), '->setHelp() sets the help');`
	`134`	`+ $command->setHelp(null);`
	`135`	`+ $this->assertEquals('description', $command->getHelp(), '->getHelp() fallback to the description');`
`134`	`136`	`}`
`135`	`137`
`136`	`138`	`public function testGetProcessedHelp()`