Merge remote-tracking branch 'origin/master'

composer.json

@@ -12,7 +12,7 @@
 
  },
  "require-dev": {
- "phpunit/phpunit": "7.*"
+ "phpunit/phpunit": "8.*"
  },
 
  "license": "MIT",

src/Argument/Argument.php

@@ -2,6 +2,7 @@
 namespace Gt\Cli\Argument;
 
 abstract class Argument {
+ const USER_DATA = "__user-data__";
  protected $key;
  protected $value;
 

src/Argument/ArgumentValueList.php

@@ -5,6 +5,7 @@ class ArgumentValueList {
  protected $valueMap = [];
 
  public function set(string $key, string $value = null):void {
+// TODO: Issue #17 can convert existing values to arrays here.
  $this->valueMap[$key] = $value;
  }
 

src/Command/Command.php

@@ -228,16 +228,28 @@ public function getArgumentValueList(
  $argumentValueList = new ArgumentValueList();
 
  foreach($arguments as $argument) {
- if($argument instanceof NamedArgument) {
+ if($argument instanceof CommandArgument) {
+ continue;
+ }
+ elseif($argument instanceof NamedArgument) {
  /** @var NamedParameter $parameter */
  $parameter = $namedParameterList[
  $namedParameterIndex
  ];
 
- $argumentValueList->set(
- $parameter->getOptionName(),
- $argument->getValue()
- );
+ if(is_null($parameter)) {
+ $argumentValueList->set(
+ Argument::USER_DATA,
+ $argument->getValue()
+ );
+ }
+ else {
+ $argumentValueList->set(
+ $parameter->getOptionName(),
+ $argument->getValue()
+ );
+ }
+
  $namedParameterIndex++;
  }
  elseif($argument instanceof Argument) {

src/Command/HelpCommand.php

@@ -20,6 +20,7 @@ public function __construct(
 
  $this->applicationName = $applicationName;
  $this->applicationCommandList = $applicationCommandList;
+ $this->applicationCommandList []= $this;
  }
 
  public function run(ArgumentValueList $arguments = null): void {
@@ -35,9 +36,17 @@ public function run(ArgumentValueList $arguments = null): void {
 
  $this->writeLine("Available commands:");
 
+ $maxNameLength = 0;
+ foreach($this->applicationCommandList as $command) {
+ $nameLength = strlen($command->getName());
+ if($nameLength > $maxNameLength) {
+ $maxNameLength = $nameLength;
+ }
+ }
+
  foreach($this->applicationCommandList as $command) {
  $this->writeLine(" • " .
- $command->getName()
+ str_pad($command->getName(), $maxNameLength, " ")
  . "\t"
  . $command->getDescription()
  );