Merge remote-tracking branch 'origin/master'

# Conflicts: # src/Application.php
PhpGt · Jun 14, 2019 · f83f193 · f83f193
2 parents 90d4e89 + d928e5e
commit f83f193
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 79 deletions.
diff --git a/src/Application.php b/src/Application.php
@@ -29,9 +29,14 @@ public function __construct(
  $this->arguments = $arguments;
  $this->commands = $commands;
 
+ $script = null;
+ if($arguments) {
+ $script = $arguments->getScript();
+ }
+
  $this->helpCommand = new HelpCommand(
  $this->description,
- $arguments->getScript(),
+ $script,
  $this->commands
  );
  $this->versionCommand = new VersionCommand(

diff --git a/src/Command/HelpCommand.php b/src/Command/HelpCommand.php
@@ -18,7 +18,7 @@ class HelpCommand extends Command {
  */
  public function __construct(
  string $applicationDescription,
- string $scriptName,
+ string $scriptName = null,
  array $applicationCommandList = []
  ) {
  $this->applicationDescription = $applicationDescription;
@@ -28,10 +28,13 @@ public function __construct(
  }
 
  public function run(ArgumentValueList $arguments = null): void {
- $command = (string)$arguments->get(
- "command",
- self::ALL_COMMANDS
- );
+ $command = null;
+ if($arguments) {
+ $command = (string)$arguments->get(
+ "command",
+ self::ALL_COMMANDS
+ );
+ }
 
  if($command === self::ALL_COMMANDS) {
  $output = $this->getHelpForAllCommands();
@@ -113,7 +116,7 @@ protected function getHelpForAllCommands():string {
  return $output;
  }
 
- protected function getHelpForCommand(string $commandName):string {
+ protected function getHelpForCommand(string $commandName = null):string {
  $output = "";
 
  $command = null;

diff --git a/test/unit/Command/CommandTest.php b/test/unit/Command/CommandTest.php
@@ -235,23 +235,23 @@ public function testGetUsageSingleRequiredNamedParameter() {
  public function testGetUsageMultipleRequiredParameter() {
  $command = new MultipleRequiredParameterCommand();
  self::assertEquals(
- "Usage: multiple-required-parameter-command id name --framework|-f rinky-dink --example",
+ "Usage: multiple-required-parameter-command id name --framework|-f FRAMEWORK --example",
  $command->getUsage()
  );
  }
 
  public function testGetUsageComboRequiredOptionalParameter() {
  $command = new ComboRequiredOptionalParameterCommand();
  self::assertEquals(
- "Usage: combo-required-optional-parameter-command id [name] --type|-t TYPE_VALUE [--verbose|-v]",
+ "Usage: combo-required-optional-parameter-command id [name] --type|-t TYPE [--verbose|-v]",
  $command->getUsage()
  );
  }
 
  public function testGetUsageAllParameterTypes() {
  $command = new AllParameterTypesCommand();
  self::assertEquals(
- "Usage: all-parameter-types-command id [name] --type|-t TYPE_VALUE [--log|-l LOG_PATH] [--verbose|-v]",
+ "Usage: all-parameter-types-command id [name] --type|-t TYPE [--log|-l LOG_PATH] [--verbose|-v]",
  $command->getUsage()
  );
  }

diff --git a/test/unit/Command/HelpCommandTest.php b/test/unit/Command/HelpCommandTest.php
diff --git a/test/unit/Helper/Command/AllParameterTypesCommand.php b/test/unit/Helper/Command/AllParameterTypesCommand.php
@@ -50,6 +50,7 @@ public function getOptionalParameterList():array {
  true,
  "log",
  "l",
+ "The path of your log file",
  "LOG_PATH"
  ),
  new Parameter(

diff --git a/test/unit/Helper/Command/ComboRequiredOptionalParameterCommand.php b/test/unit/Helper/Command/ComboRequiredOptionalParameterCommand.php
@@ -38,7 +38,8 @@ public function getRequiredParameterList():array {
  new Parameter(
  true,
  "type",
- "t"
+ "t",
+ "What type of thing you are using"
  ),
  ];
  }

diff --git a/test/unit/Helper/Command/MultipleRequiredParameterCommand.php b/test/unit/Helper/Command/MultipleRequiredParameterCommand.php
@@ -38,7 +38,7 @@ public function getRequiredParameterList():array {
  true,
  "framework",
  "f",
- "rinky-dink"
+ "The name of your framework"
  ),
  new Parameter(
  false,