merged branch Nanocom/master (PR #4346)

fabpot · fabpot · commit c1e868f994ff · 2012-05-22T12:30:31.000+02:00
Commits ------- 2c19b3c Empty shortcut check in the constructor cf9039e Added a unit test for the shortcut name of the InputOption class Discussion ---------- [Console] Single dash for option shortcuts See #4062 --------------------------------------------------------------------------- by travisbot at 2012-05-20T13:09:18Z This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1380389) (merged 02290da4 into f433f6b). --------------------------------------------------------------------------- by stof at 2012-05-20T13:16:34Z please rebase your branch to get rid of these merge commits btw, you should use feature branches to send your next pull requests instead of using your master branch each time, which limits you to a single PR. --------------------------------------------------------------------------- by Nanocom at 2012-05-20T13:39:32Z Sorry for the mess, cleaning it --------------------------------------------------------------------------- by travisbot at 2012-05-20T13:41:46Z This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1380549) (merged 63129657 into f433f6b). --------------------------------------------------------------------------- by travisbot at 2012-05-20T13:43:07Z This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1380553) (merged 2c19b3c into f433f6b).
diff --git a/src/Symfony/Component/Console/Input/InputOption.php b/src/Symfony/Component/Console/Input/InputOption.php
@@ -58,6 +58,10 @@ public function __construct($name, $shortcut = null, $mode = null, $description
             if ('-' === $shortcut[0]) {
                 $shortcut = substr($shortcut, 1);
             }
+
+            if (empty($shortcut)) {
+                $shortcut = null;
+            }
         }
 
         if (null === $mode) {
diff --git a/src/Symfony/Component/Console/Tests/Input/InputOptionTest.php b/src/Symfony/Component/Console/Tests/Input/InputOptionTest.php
@@ -35,6 +35,10 @@ public function testConstructor()
         $this->assertEquals('f', $option->getShortcut(), '__construct() can take a shortcut as its second argument');
         $option = new InputOption('foo', '-f');
         $this->assertEquals('f', $option->getShortcut(), '__construct() removes the leading - of the shortcut');
+        $option = new InputOption('foo');
+        $this->assertNull($option->getShortcut(), '__construct() makes the shortcut null by default');
+        $option = new InputOption('foo', '-');
+        $this->assertNull($option->getShortcut(), '__construct() makes the shortcut null if a single dash is specified as its name');
 
         // mode argument
         $option = new InputOption('foo', 'f');

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,10 @@ public function __construct($name, $shortcut = null, $mode = null, $description`
`58`	`58`	`if ('-' === $shortcut[0]) {`
`59`	`59`	`$shortcut = substr($shortcut, 1);`
`60`	`60`	`}`
	`61`	`+`
	`62`	`+ if (empty($shortcut)) {`
	`63`	`+ $shortcut = null;`
	`64`	`+ }`
`61`	`65`	`}`
`62`	`66`
`63`	`67`	`if (null === $mode) {`