rabe/helpers-cli-input
11
0
Fork 0
mirror of https://github.com/n3w/helpers-cli-input.git synced 2025-12-19 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Updated validation logic for inputs that have a validator, no default, and are not set. Using InputValidationFailedException exception when validation fails

Browse source
This commit is contained in:
Alannah Kearney 2019-05-25 11:59:29 +10:00
commit 695b4ac75a
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/Input/AbstractInputHandler.php
View file

@ -45,13 +45,17 @@ abstract class AbstractInputHandler implements Interfaces\InputHandlerInterface
foreach($items as $input) { foreach($items as $input) {
self::checkRequiredAndRequiredValue($input, $this->input); self::checkRequiredAndRequiredValue($input, $this->input);
// There is a default value, input has not been set, and there
// is no validator
if( if(
null !== $input->default() && null !== $input->default() &&
null === $this->find($input->name()) && null === $this->find($input->name()) &&
null === $input->validator() null === $input->validator()
) { ) {
$result = $input->default(); $result = $input->default();
} elseif(null !== $input->validator()) {
// Input has been set and it has a validator
} elseif(null !== $this->find($input->name()) && null !== $input->validator()) {
$validator = $input->validator(); $validator = $input->validator();
if ($validator instanceof \Closure) { if ($validator instanceof \Closure) {
@ -60,7 +64,13 @@ abstract class AbstractInputHandler implements Interfaces\InputHandlerInterface
throw new \Exception("Validator for '{$input->name()}' must be NULL or an instance of either Closure or Input\Validator."); throw new \Exception("Validator for '{$input->name()}' must be NULL or an instance of either Closure or Input\Validator.");
} }
$result = $validator->validate($input, $this); try {
$result = $validator->validate($input, $this);
} catch(\Exception $ex) {
throw new Exceptions\InputValidationFailedException($input, 0, $ex);
}
// No default, no validator, but may or may not have been set
} else { } else {
$result = $this->find($input->name()); $result = $this->find($input->name());
} }