fix wrong order of command line arguments

stubbles · Jun 17, 2015 · c1af1ba · c1af1ba
1 parent 2c87130
commit c1af1ba
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+5.0.1 (2015-06-17)
+------------------
+
+  * fixed wrong order of command line arguments
+
+
 5.0.0 (2015-05-28)
 ------------------
 

diff --git a/src/main/php/input/RequestParser.php b/src/main/php/input/RequestParser.php
@@ -127,13 +127,14 @@ private function createHelp($object, $group)
             if (substr($targetMethod->paramName(), 0, 5) !== 'argv.') {
                 $options[$this->getOptionName($targetMethod)] = $targetMethod->paramDescription();
             } elseif (!$targetMethod->isRequired()) {
-                $parameters[] = '[' . $targetMethod->paramDescription() . ']';
+                $parameters[$targetMethod->paramName()] = '[' . $targetMethod->paramDescription() . ']';
             } else {
-                $parameters[] = $targetMethod->paramDescription();
+                $parameters[$targetMethod->paramName()] = $targetMethod->paramDescription();
             }
         }
 
         $options['-h or --help'] = 'Prints this help.';
+        asort($parameters);
         return $this->creatHelpWriter(
                 $this->readAppDescription($object),
                 $this->request->readEnv('SCRIPT_NAME')->unsecure(),

diff --git a/src/test/helper/BrokeredUserInput.php b/src/test/helper/BrokeredUserInput.php
@@ -64,6 +64,17 @@ public function isVerbose()
         return $this->verbose;
     }
 
+    /**
+     * test method
+     *
+     * @Request[String](paramName='argv.1', paramGroup='arg', paramDescription='other-id')
+     * @param  string  $arg
+     */
+    public function setOtherArgument($arg)
+    {
+        $this->bar = $arg;
+    }
+
     /**
      * test method
      *

diff --git a/src/test/php/input/RequestParserTest.php b/src/test/php/input/RequestParserTest.php
@@ -112,7 +112,7 @@ public function helpClosureRendersHelpToOutputStream()
             $cae->writeTo($memoryOutputStream);
             assertEquals(
                     "Real awesome command line app (c) 2012 Stubbles Development Team
-Usage: bin/http [options] [application-id]
+Usage: bin/http [options] [application-id] [other-id]
 Options:
    --verbose
    -v