Skip to content
This repository was archived by the owner on Jan 30, 2020. It is now read-only.

Tune NonEmpty options for detect the expected empty values #53

Closed
wants to merge 2 commits into from
Closed

Tune NonEmpty options for detect the expected empty values #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50f987b
Expand test matrix with nonempty value scenarios
Maks3w Sep 2, 2015
b79b531
Tune NonEmpty validator
Maks3w Sep 2, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions src/Input.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,13 +472,21 @@ protected function injectNotEmptyValidator()
}

$this->notEmptyValidator = true;
$options = [
'type' => [
NotEmpty::NULL |
NotEmpty::STRING |
NotEmpty::EMPTY_ARRAY |
NotEmpty::OBJECT
],
];

if (class_exists(AbstractPluginManager::class)) {
$chain->prependByName('NotEmpty', [], true);
$chain->prependByName('NotEmpty', $options, true);

return;
}

$chain->prependValidator(new NotEmpty(), true);
$chain->prependValidator(new NotEmpty($options), true);
}
}
6 changes: 3 additions & 3 deletions test/FileInputTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,9 +430,9 @@ public function isRequiredVsAllowEmptyVsContinueIfEmptyVsIsValidProvider()
$dataSets = parent::isRequiredVsAllowEmptyVsContinueIfEmptyVsIsValidProvider();

// FileInput do not use NotEmpty validator so the only validator present in the chain is the custom one.
unset($dataSets['Required: T; AEmpty: F; CIEmpty: F; Validator: X / tmp_name']);
unset($dataSets['Required: T; AEmpty: F; CIEmpty: F; Validator: X / single']);
unset($dataSets['Required: T; AEmpty: F; CIEmpty: F; Validator: X / multi']);
unset($dataSets['Required: T; AEmpty: F; CIEmpty: F; Validator: X, Value: Empty / tmp_name']);
unset($dataSets['Required: T; AEmpty: F; CIEmpty: F; Validator: X, Value: Empty / single']);
unset($dataSets['Required: T; AEmpty: F; CIEmpty: F; Validator: X, Value: Empty / multi']);

return $dataSets;
}
Expand Down
41 changes: 29 additions & 12 deletions test/InputTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,9 @@ public function setValueProvider()

public function isRequiredVsAllowEmptyVsContinueIfEmptyVsIsValidProvider()
{
$allValues = $this->setValueProvider();
$emptyValues = $this->emptyValueProvider();
$nonEmptyValues = array_diff_key($allValues, $emptyValues);

$isRequired = true;
$aEmpty = true;
Expand All @@ -565,18 +567,33 @@ public function isRequiredVsAllowEmptyVsContinueIfEmptyVsIsValidProvider()
// @codingStandardsIgnoreStart
$dataTemplates=[
// Description => [$isRequired, $allowEmpty, $continueIfEmpty, $validator, [$values], $expectedIsValid, $expectedMessages]
'Required: T; AEmpty: T; CIEmpty: T; Validator: T' => [ $isRequired, $aEmpty, $cIEmpty, $validatorValid , $emptyValues, $isValid, []],
'Required: T; AEmpty: T; CIEmpty: T; Validator: F' => [ $isRequired, $aEmpty, $cIEmpty, $validatorInvalid, $emptyValues, !$isValid, $validatorMsg],
'Required: T; AEmpty: T; CIEmpty: F; Validator: X' => [ $isRequired, $aEmpty, !$cIEmpty, $validatorNotCall, $emptyValues, $isValid, []],
'Required: T; AEmpty: F; CIEmpty: T; Validator: T' => [ $isRequired, !$aEmpty, $cIEmpty, $validatorValid , $emptyValues, $isValid, []],
'Required: T; AEmpty: F; CIEmpty: T; Validator: F' => [ $isRequired, !$aEmpty, $cIEmpty, $validatorInvalid, $emptyValues, !$isValid, $validatorMsg],
'Required: T; AEmpty: F; CIEmpty: F; Validator: X' => [ $isRequired, !$aEmpty, !$cIEmpty, $validatorNotCall, $emptyValues, !$isValid, $notEmptyMsg],
'Required: F; AEmpty: T; CIEmpty: T; Validator: T' => [!$isRequired, $aEmpty, $cIEmpty, $validatorValid , $emptyValues, $isValid, []],
'Required: F; AEmpty: T; CIEmpty: T; Validator: F' => [!$isRequired, $aEmpty, $cIEmpty, $validatorInvalid, $emptyValues, !$isValid, $validatorMsg],
'Required: F; AEmpty: T; CIEmpty: F; Validator: X' => [!$isRequired, $aEmpty, !$cIEmpty, $validatorNotCall, $emptyValues, $isValid, []],
'Required: F; AEmpty: F; CIEmpty: T; Validator: T' => [!$isRequired, !$aEmpty, $cIEmpty, $validatorValid , $emptyValues, $isValid, []],
'Required: F; AEmpty: F; CIEmpty: T; Validator: F' => [!$isRequired, !$aEmpty, $cIEmpty, $validatorInvalid, $emptyValues, !$isValid, $validatorMsg],
'Required: F; AEmpty: F; CIEmpty: F; Validator: X' => [!$isRequired, !$aEmpty, !$cIEmpty, $validatorNotCall, $emptyValues, $isValid, []],
'Required: T; AEmpty: T; CIEmpty: T; Validator: T' => [ $isRequired, $aEmpty, $cIEmpty, $validatorValid , $allValues , $isValid, []],
'Required: T; AEmpty: T; CIEmpty: T; Validator: F' => [ $isRequired, $aEmpty, $cIEmpty, $validatorInvalid, $allValues , !$isValid, $validatorMsg],

'Required: T; AEmpty: T; CIEmpty: F; Validator: X, Value: Empty' => [ $isRequired, $aEmpty, !$cIEmpty, $validatorNotCall, $emptyValues , $isValid, []],
'Required: T; AEmpty: T; CIEmpty: F; Validator: T, Value: Not Empty' => [ $isRequired, $aEmpty, !$cIEmpty, $validatorValid , $nonEmptyValues, $isValid, []],
'Required: T; AEmpty: T; CIEmpty: F; Validator: F, Value: Not Empty' => [ $isRequired, $aEmpty, !$cIEmpty, $validatorInvalid, $nonEmptyValues, !$isValid, $validatorMsg],

'Required: T; AEmpty: F; CIEmpty: T; Validator: T' => [ $isRequired, !$aEmpty, $cIEmpty, $validatorValid , $allValues , $isValid, []],
'Required: T; AEmpty: F; CIEmpty: T; Validator: F' => [ $isRequired, !$aEmpty, $cIEmpty, $validatorInvalid, $allValues , !$isValid, $validatorMsg],

'Required: T; AEmpty: F; CIEmpty: F; Validator: X, Value: Empty' => [ $isRequired, !$aEmpty, !$cIEmpty, $validatorNotCall, $emptyValues , !$isValid, $notEmptyMsg],
'Required: T; AEmpty: F; CIEmpty: F; Validator: T, Value: Not Empty' => [ $isRequired, !$aEmpty, !$cIEmpty, $validatorValid , $nonEmptyValues, $isValid, []],
'Required: T; AEmpty: F; CIEmpty: F; Validator: F, Value: Not Empty' => [ $isRequired, !$aEmpty, !$cIEmpty, $validatorInvalid, $nonEmptyValues, !$isValid, $validatorMsg],

'Required: F; AEmpty: T; CIEmpty: T; Validator: T' => [!$isRequired, $aEmpty, $cIEmpty, $validatorValid , $allValues , $isValid, []],
'Required: F; AEmpty: T; CIEmpty: T; Validator: F' => [!$isRequired, $aEmpty, $cIEmpty, $validatorInvalid, $allValues , !$isValid, $validatorMsg],

'Required: F; AEmpty: T; CIEmpty: F; Validator: X, Value: Empty' => [!$isRequired, $aEmpty, !$cIEmpty, $validatorNotCall, $emptyValues , $isValid, []],
'Required: F; AEmpty: T; CIEmpty: F; Validator: T, Value: Not Empty' => [!$isRequired, $aEmpty, !$cIEmpty, $validatorValid , $nonEmptyValues, $isValid, []],
'Required: F; AEmpty: T; CIEmpty: F; Validator: F, Value: Not Empty' => [!$isRequired, $aEmpty, !$cIEmpty, $validatorInvalid, $nonEmptyValues, !$isValid, $validatorMsg],

'Required: F; AEmpty: F; CIEmpty: T; Validator: T' => [!$isRequired, !$aEmpty, $cIEmpty, $validatorValid , $allValues , $isValid, []],
'Required: F; AEmpty: F; CIEmpty: T; Validator: F' => [!$isRequired, !$aEmpty, $cIEmpty, $validatorInvalid, $allValues , !$isValid, $validatorMsg],

'Required: F; AEmpty: F; CIEmpty: F; Validator: X, Value: Empty' => [!$isRequired, !$aEmpty, !$cIEmpty, $validatorNotCall, $emptyValues , $isValid, []],
'Required: F; AEmpty: F; CIEmpty: F; Validator: T, Value: Not Empty' => [!$isRequired, !$aEmpty, !$cIEmpty, $validatorValid , $nonEmptyValues, $isValid, []],
'Required: F; AEmpty: F; CIEmpty: F; Validator: F, Value: Not Empty' => [!$isRequired, !$aEmpty, !$cIEmpty, $validatorInvalid, $nonEmptyValues, !$isValid, $validatorMsg],
];
// @codingStandardsIgnoreEnd

Expand Down