From 1f01d89bb2c76c3b458ceb84a0d3c232f7d64380 Mon Sep 17 00:00:00 2001 From: mikey179 Date: Sat, 11 Jun 2016 17:26:20 +0200 Subject: [PATCH] move classes to stubbles/console --- CHANGELOG.md | 4 +- src/main/php/console/BaseConsoleRequest.php | 119 ----------- src/main/php/console/ConsoleRequest.php | 57 ------ .../php/console/BaseConsoleRequestTest.php | 186 ------------------ 4 files changed, 3 insertions(+), 363 deletions(-) delete mode 100644 src/main/php/console/BaseConsoleRequest.php delete mode 100644 src/main/php/console/ConsoleRequest.php delete mode 100644 src/test/php/console/BaseConsoleRequestTest.php diff --git a/CHANGELOG.md b/CHANGELOG.md index 20d0326..5ac2d59 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -6.0.0 (201?-??-??) +6.0.0 (2016-??-??) ------------------ ### BC breaks @@ -11,6 +11,8 @@ * deprecated `stubbles\input\ValueValidator::satisfiesRegex()`, use `stubbles\input\ValueValidator::matches()` instead, will be removed with 7.0.0 * removed support for `@Request[File]` and `@Request[Directory]` * removed `stubbles\input\ValueReader::ifIsFile()` and `stubbles\input\ValueReader::ifIsDirectory()` + * moved `stubbles\input\console\ConsoleRequest` to `stubbles\console\input\ConsoleRequest` in stubbles/console + * moved `stubbles\input\console\BaseConsoleRequest` to `stubbles\console\input\BaseConsoleRequest` in stubbles/console ### Other changes diff --git a/src/main/php/console/BaseConsoleRequest.php b/src/main/php/console/BaseConsoleRequest.php deleted file mode 100644 index fdb0595..0000000 --- a/src/main/php/console/BaseConsoleRequest.php +++ /dev/null @@ -1,119 +0,0 @@ -env = new Params($env); - } - - /** - * creates an instance from raw data - * - * Will use $_SERVER['argv'] for params and $_SERVER for env. - * - * @api - * @return \stubbles\input\console\ConsoleRequest - */ - public static function fromRawSource() - { - return new self($_SERVER['argv'], $_SERVER); - } - - /** - * returns the request method - * - * @return string - */ - public function method() - { - return 'cli'; - } - - /** - * return a list of all environment names registered in this request - * - * @return string[] - */ - public function envNames() - { - return $this->env->names(); - } - - /** - * returns list of errors for environment parameters - * - * @return \stubbles\input\ParamErrors - */ - public function envErrors() - { - return $this->env->errors(); - } - - /** - * checks whether a request param is set - * - * @param string $envName - * @return bool - */ - public function hasEnv($envName) - { - return $this->env->contain($envName); - } - - /** - * checks whether a request value from parameters is valid or not - * - * @param string $envName name of environment value - * @return \stubbles\input\ValueValidator - */ - public function validateEnv($envName) - { - return new ValueValidator($this->env->value($envName)); - } - - /** - * returns request value from params for validation - * - * @param string $envName name of environment value - * @return \stubbles\input\ValueReader - */ - public function readEnv($envName) - { - return new ValueReader($this->env->errors(), - $this->env->get($envName) - ); - } -} diff --git a/src/main/php/console/ConsoleRequest.php b/src/main/php/console/ConsoleRequest.php deleted file mode 100644 index 021975d..0000000 --- a/src/main/php/console/ConsoleRequest.php +++ /dev/null @@ -1,57 +0,0 @@ -serverBackup = $_SERVER; - $this->baseConsoleRequest = new BaseConsoleRequest( - ['foo' => 'bar', 'roland' => 'TB-303'], - ['SCRIPT_NAME' => 'example.php', - 'PHP_SELF' => 'example.php' - ] - ); - } - - /** - * clean up test environment - */ - public function tearDown() - { - $_SERVER = $this->serverBackup; - } - - /** - * @test - */ - public function requestMethodIsAlwaysCli() - { - assert($this->baseConsoleRequest->method(), equals('cli')); - } - - /** - * @test - */ - public function returnsListOfParamNames() - { - assert($this->baseConsoleRequest->paramNames(), equals(['foo', 'roland'])); - } - - /** - * @test - */ - public function createFromRawSourceUsesServerArgsForParams() - { - $_SERVER['argv'] = ['foo' => 'bar', 'roland' => 'TB-303']; - assert( - BaseConsoleRequest::fromRawSource()->paramNames(), - equals(['foo', 'roland']) - ); - } - - /** - * @test - */ - public function returnsListOfEnvNames() - { - assert( - $this->baseConsoleRequest->envNames(), - equals(['SCRIPT_NAME', 'PHP_SELF']) - ); - } - - /** - * @test - */ - public function returnsEnvErrors() - { - assert( - $this->baseConsoleRequest->envErrors(), - isInstanceOf(ParamErrors::class) - ); - } - - /** - * @test - */ - public function returnsFalseOnCheckForNonExistingEnv() - { - assertFalse($this->baseConsoleRequest->hasEnv('baz')); - } - - /** - * @test - */ - public function returnsTrueOnCheckForExistingEnv() - { - assertTrue($this->baseConsoleRequest->hasEnv('SCRIPT_NAME')); - } - - /** - * @test - */ - public function validateEnvReturnsValueValidator() - { - assert( - $this->baseConsoleRequest->validateEnv('SCRIPT_NAME'), - isInstanceOf(ValueValidator::class) - ); - } - - /** - * @test - */ - public function validateEnvReturnsValueValidatorForNonExistingParam() - { - assert( - $this->baseConsoleRequest->validateEnv('baz'), - isInstanceOf(ValueValidator::class) - ); - } - - /** - * @test - */ - public function readEnvReturnsValueReader() - { - assert( - $this->baseConsoleRequest->readEnv('SCRIPT_NAME'), - isInstanceOf(ValueReader::class) - ); - } - - /** - * @test - */ - public function readEnvReturnsValueReaderForNonExistingParam() - { - assert( - $this->baseConsoleRequest->readEnv('baz'), - isInstanceOf(ValueReader::class) - ); - } - - /** - * @test - */ - public function createFromRawSourceUsesServerForEnv() - { - $_SERVER = ['argv' => ['foo' => 'bar', 'roland' => 'TB-303'], - 'SCRIPT_NAME' => 'example.php' - ]; - assert( - BaseConsoleRequest::fromRawSource()->envNames(), - equals(['argv', 'SCRIPT_NAME']) - ); - } -}