From 4b29e666b06762b4b36438c9370c38bc43121f78 Mon Sep 17 00:00:00 2001 From: Kasimir Cash Date: Wed, 28 Feb 2024 12:23:28 +0000 Subject: Command Line Parser Concept (#6099) * Adds logic for validation * Adds validation to do-install * Adds help to do-install * Adds validation & help to reconfigure * Adds validation to check.translation * Adds validation to manipulate.translation * Small fixes to help texts * Refactors language option validation * Adds default options to validation * Fixes validation with regex * Refactors readAs functions * Updates to new regex validation format * Fixes typing around default values * Adds file extension validation * Restandardises validation & parsing typing around array of strings * Adds NotOneOf validation * Adds ArrayOfString read as * Refactors existing validation * Adds validation throughout cli * Removes unused file * Adds new CL parser with goal of wrapping CLI behaviour * Hides parsing and validation * Rewites CL parser to make better use of classes * Rolls out new parser across CL * Fixes error during unknown option check * Fixes misnamed property calls * Seperates validations into more appropriate locations * Adds common boolean forms to validation * Moves CommandLineParser and Option classes into their own files * Fixes error when validating Int type * Rewrites appendTypedValues -> appendTypedValidValues now filters invalid values from output * Renames -> for clarity * Adds some docs clarifying option defaults and value taking behaviour * Refactors getUsageMessage for readability * Minor formatting changes * Adds tests for CommandLineParser * Adds more tests * Adds minor fixs * Reconfigure now correctly updates config * More fixes to reconfigure * Fixes required files for CommandLineParserTest * Use .php extension for PHP file * PHPStan ignore instead of wrong typing * Refactors to support php 7.4 * Moves away from dynamic properties by adding 'Definintions' to all commands * Renames target to definition for clarity * Stops null from being returned as a valid value in a certain edge case * Adds PHPStan ignore instead of incorrect typing * Refactors tests to take account of new typing solution * Marks file as executable * Draft CLI rework * Finish rewrite as object-oriented * Fix PHPStan ignore and make more strongly typed * Rename class Option to CliOption * Light renaming + anonymous classes --------- Co-authored-by: Alexandre Alapetite --- tests/cli/CliOptionsParserTest.php | 242 +++++++++++++++++++++++++++++++++++++ tests/cli/cli-parser-test.php | 24 ++++ 2 files changed, 266 insertions(+) create mode 100644 tests/cli/CliOptionsParserTest.php create mode 100755 tests/cli/cli-parser-test.php (limited to 'tests') diff --git a/tests/cli/CliOptionsParserTest.php b/tests/cli/CliOptionsParserTest.php new file mode 100644 index 000000000..facb5dbc5 --- /dev/null +++ b/tests/cli/CliOptionsParserTest.php @@ -0,0 +1,242 @@ + $arrayOfString */ + public array $arrayOfString = []; + public string $defaultInput = ''; + public string $optionalValue = ''; + public bool $optionalValueWithDefault = false; + public string $defaultInputAndOptionalValueWithDefault = ''; + + public function __construct() { + $this->addOption('string', (new CliOption('string', 's'))->deprecatedAs('deprecated-string')); + $this->addOption('int', (new CliOption('int', 'i'))->typeOfInt()); + $this->addOption('bool', (new CliOption('bool', 'b'))->typeOfBool()); + $this->addOption('arrayOfString', (new CliOption('array-of-string', 'a'))->typeOfArrayOfString()); + $this->addOption('defaultInput', (new CliOption('default-input', 'i')), 'default'); + $this->addOption('optionalValue', (new CliOption('optional-value', 'o'))->withValueOptional()); + $this->addOption('optionalValueWithDefault', (new CliOption('optional-value-with-default', 'd'))->withValueOptional('true')->typeOfBool()); + $this->addOption('defaultInputAndOptionalValueWithDefault', + (new CliOption('default-input-and-optional-value-with-default', 'e'))->withValueOptional('optional'), + 'default' + ); + $this->addOption('flag', (new CliOption('flag', 'f'))->withValueNone()); + parent::__construct(); + } +} + +final class CliOptionsOptionalAndRequiredTest extends CliOptionsParser { + public string $required = ''; + public string $string = ''; + public int $int = 0; + public bool $bool = false; + public string $flag = ''; + + public function __construct() { + $this->addRequiredOption('required', new CliOption('required')); + $this->addOption('string', new CliOption('string', 's')); + $this->addOption('int', (new CliOption('int', 'i'))->typeOfInt()); + $this->addOption('bool', (new CliOption('bool', 'b'))->typeOfBool()); + $this->addOption('flag', (new CliOption('flag', 'f'))->withValueNone()); + parent::__construct(); + } +} + +class CliOptionsParserTest extends TestCase { + + public function testInvalidOptionSetWithValueReturnsError(): void { + $result = $this->runOptionalOptions('--invalid=invalid'); + + self::assertEquals(['invalid' => 'unknown option: invalid'], $result->errors); + } + + public function testInvalidOptionSetWithoutValueReturnsError(): void { + $result = $this->runOptionalOptions('--invalid'); + + self::assertEquals(['invalid' => 'unknown option: invalid'], $result->errors); + } + + public function testValidOptionSetWithValidValueAndInvalidOptionSetWithValueReturnsValueForValidOptionAndErrorForInvalidOption(): void { + $result = $this->runOptionalOptions('--string=string --invalid=invalid'); + + self::assertEquals('string', $result->string); + self::assertEquals(['invalid' => 'unknown option: invalid'], $result->errors); + } + + public function testOptionWithValueTypeOfStringSetOnceWithValidValueReturnsValueAsString(): void { + $result = $this->runOptionalOptions('--string=string'); + + self::assertEquals('string', $result->string); + } + + public function testOptionWithRequiredValueTypeOfIntSetOnceWithValidValueReturnsValueAsInt(): void { + $result = $this->runOptionalOptions('--int=111'); + + self::assertEquals(111, $result->int); + } + + public function testOptionWithRequiredValueTypeOfBoolSetOnceWithValidValueReturnsValueAsBool(): void { + $result = $this->runOptionalOptions('--bool=on'); + + self::assertEquals(true, $result->bool); + } + + public function testOptionWithValueTypeOfArrayOfStringSetOnceWithValidValueReturnsValueAsArrayOfString(): void { + $result = $this->runOptionalOptions('--array-of-string=string'); + + self::assertEquals(['string'], $result->arrayOfString); + } + + public function testOptionWithValueTypeOfStringSetMultipleTimesWithValidValueReturnsLastValueSetAsString(): void { + $result = $this->runOptionalOptions('--string=first --string=second'); + + self::assertEquals('second', $result->string); + } + + public function testOptionWithValueTypeOfIntSetMultipleTimesWithValidValueReturnsLastValueSetAsInt(): void { + $result = $this->runOptionalOptions('--int=111 --int=222'); + + self::assertEquals(222, $result->int); + } + + public function testOptionWithValueTypeOfBoolSetMultipleTimesWithValidValueReturnsLastValueSetAsBool(): void { + $result = $this->runOptionalOptions('--bool=on --bool=off'); + + self::assertEquals(false, $result->bool); + } + + public function testOptionWithValueTypeOfArrayOfStringSetMultipleTimesWithValidValueReturnsAllSetValuesAsArrayOfString(): void { + $result = $this->runOptionalOptions('--array-of-string=first --array-of-string=second'); + + self::assertEquals(['first', 'second'], $result->arrayOfString); + } + + public function testOptionWithValueTypeOfIntSetWithInvalidValueReturnsAnError(): void { + $result = $this->runOptionalOptions('--int=one'); + + self::assertEquals(['int' => 'invalid input: int must be an integer'], $result->errors); + } + + public function testOptionWithValueTypeOfBoolSetWithInvalidValuesReturnsAnError(): void { + $result = $this->runOptionalOptions('--bool=bad'); + + self::assertEquals(['bool' => 'invalid input: bool must be a boolean'], $result->errors); + } + + public function testOptionWithValueTypeOfIntSetMultipleTimesWithValidAndInvalidValuesReturnsLastValidValueSetAsIntAndError(): void { + $result = $this->runOptionalOptions('--int=111 --int=one --int=222 --int=two'); + + self::assertEquals(222, $result->int); + self::assertEquals(['int' => 'invalid input: int must be an integer'], $result->errors); + } + + public function testOptionWithValueTypeOfBoolSetMultipleTimesWithWithValidAndInvalidValuesReturnsLastValidValueSetAsBoolAndError(): void { + $result = $this->runOptionalOptions('--bool=on --bool=good --bool=off --bool=bad'); + + self::assertEquals(false, $result->bool); + self::assertEquals(['bool' => 'invalid input: bool must be a boolean'], $result->errors); + } + + public function testNotSetOptionWithDefaultInputReturnsDefaultInput(): void { + $result = $this->runOptionalOptions(''); + + self::assertEquals('default', $result->defaultInput); + } + + public function testOptionWithDefaultInputSetWithValidValueReturnsCorrectlyTypedValue(): void { + $result = $this->runOptionalOptions('--default-input=input'); + + self::assertEquals('input', $result->defaultInput); + } + + public function testOptionWithOptionalValueSetWithoutValueReturnsEmptyString(): void { + $result = $this->runOptionalOptions('--optional-value'); + + self::assertEquals('', $result->optionalValue); + } + + public function testOptionWithOptionalValueDefaultSetWithoutValueReturnsOptionalValueDefault(): void { + $result = $this->runOptionalOptions('--optional-value-with-default'); + + self::assertEquals(true, $result->optionalValueWithDefault); + } + + public function testNotSetOptionWithOptionalValueDefaultAndDefaultInputReturnsDefaultInput(): void { + $result = $this->runOptionalOptions(''); + + self::assertEquals('default', $result->defaultInputAndOptionalValueWithDefault); + } + + public function testOptionWithOptionalValueDefaultAndDefaultInputSetWithoutValueReturnsOptionalValueDefault(): void { + $result = $this->runOptionalOptions('--default-input-and-optional-value-with-default'); + + self::assertEquals('optional', $result->defaultInputAndOptionalValueWithDefault); + } + + public function testRequiredOptionNotSetReturnsError(): void { + $result = $this->runOptionalAndRequiredOptions(''); + + self::assertEquals(['required' => 'invalid input: required cannot be empty'], $result->errors); + } + + public function testOptionSetWithDeprecatedAliasGeneratesDeprecationWarningAndReturnsValue(): void { + $result = $this->runCommandReadingStandardError('--deprecated-string=string'); + + self::assertEquals('FreshRSS deprecation warning: the CLI option(s): deprecated-string are deprecated ' . + 'and will be removed in a future release. Use: string instead', + $result + ); + + $result = $this->runOptionalOptions('--deprecated-string=string'); + + self::assertEquals('string', $result->string); + } + + public function testAlwaysReturnUsageMessageWithUsageInfoForAllOptions(): void { + $result = $this->runOptionalAndRequiredOptions(''); + + self::assertEquals('Usage: cli-parser-test.php --required= [-s --string=] [-i --int=] [-b --bool=] [-f --flag]', + $result->usage, + ); + } + + private function runOptionalOptions(string $cliOptions = ''): CliOptionsOptionalTest { + $command = __DIR__ . '/cli-parser-test.php'; + $className = CliOptionsOptionalTest::class; + + $result = shell_exec("CLI_PARSER_TEST_OPTIONS_CLASS='$className' $command $cliOptions 2>/dev/null"); + $result = is_string($result) ? unserialize($result) : new CliOptionsOptionalTest(); + + /** @var CliOptionsOptionalTest $result */ + return $result; + } + + private function runOptionalAndRequiredOptions(string $cliOptions = ''): CliOptionsOptionalAndRequiredTest { + $command = __DIR__ . '/cli-parser-test.php'; + $className = CliOptionsOptionalAndRequiredTest::class; + + $result = shell_exec("CLI_PARSER_TEST_OPTIONS_CLASS='$className' $command $cliOptions 2>/dev/null"); + $result = is_string($result) ? unserialize($result) : new CliOptionsOptionalAndRequiredTest(); + + /** @var CliOptionsOptionalAndRequiredTest $result */ + return $result; + } + + private function runCommandReadingStandardError(string $cliOptions = ''): string { + $command = __DIR__ . '/cli-parser-test.php'; + $className = CliOptionsOptionalTest::class; + + $result = shell_exec("CLI_PARSER_TEST_OPTIONS_CLASS='$className' $command $cliOptions 2>&1"); + $result = is_string($result) ? explode("\n", $result) : ''; + + return is_array($result) ? $result[0] : ''; + } +} diff --git a/tests/cli/cli-parser-test.php b/tests/cli/cli-parser-test.php new file mode 100755 index 000000000..6806d29ce --- /dev/null +++ b/tests/cli/cli-parser-test.php @@ -0,0 +1,24 @@ +#!/usr/bin/env php +