Merge branch 'hotfix/3047' into develop

Forward port #3047
zendframework · Dec 10, 2012 · 38e7d8a · 38e7d8a
2 parents c64ace9 + f868665
commit 38e7d8a
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 1 deletion.
diff --git a/library/Zend/Console/Getopt.php b/library/Zend/Console/Getopt.php
@@ -565,6 +565,9 @@ public function getUsageMessage()
         $maxLen = 20;
         $lines = array();
         foreach ($this->rules as $rule) {
+            if (isset($rule['isFreeformFlag'])) {
+                continue;
+            }
             $flags = array();
             if (is_array($rule['alias'])) {
                 foreach ($rule['alias'] as $flag) {
@@ -763,7 +766,10 @@ protected function _parseSingleOption($flag, &$argv)
             // Magic methods in future will use this mark as real flag value
             $this->ruleMap[$flag] = $flag;
             $realFlag = $flag;
-            $this->rules[$realFlag] = array('param' => 'optional');
+            $this->rules[$realFlag] = array(
+                'param'          => 'optional',
+                'isFreeformFlag' => true
+            );
         } else {
             $realFlag = $this->ruleMap[$flag];
         }

diff --git a/tests/ZendTest/Console/GetoptTest.php b/tests/ZendTest/Console/GetoptTest.php
@@ -589,6 +589,35 @@ public function testGetoptWithFreeformFlagOptionRecognizeFlagsWithValue()
         $this->assertEquals('test', $opts->freeform);
     }
 
+    public function testGetoptWithFreeformFlagOptionShowHelpAfterParseDoesNotThrowNotices()
+    {
+        // this formerly failed, because the index 'alias' is not set for freeform flags.
+        $opts = new Getopt(
+            array('colors' => 'Colors-option'),
+            array('color', '--freeform', 'test', 'zend'),
+            array(Getopt::CONFIG_FREEFORM_FLAGS => true)
+        );
+        $opts->parse();
+
+        $opts->getUsageMessage();
+    }
+
+    public function testGetoptWithFreeformFlagOptionShowHelpAfterParseDoesNotShowFreeformFlags()
+    {
+        $opts = new Getopt(
+            array('colors' => 'Colors-option'),
+            array('color', '--freeform', 'test', 'zend'),
+            array(Getopt::CONFIG_FREEFORM_FLAGS => true)
+        );
+        $opts->parse();
+
+        $message = preg_replace('/Usage: .* \[ options \]/',
+            'Usage: <progname> [ options ]',
+            $opts->getUsageMessage());
+        $message = preg_replace('/ /', '_', $message);
+        $this->assertEquals($message, "Usage:_<progname>_[_options_]\n--colors_____________Colors-option\n");
+    }
+
     public function testGetoptRaiseExceptionForNumericOptionsByDefault()
     {
         $opts = new Getopt(