LiittleCookie/valitron
1
0
Fork 0
mirror of https://github.com/vlucas/valitron.git synced 2025-12-30 23:01:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

validate fields that are required, but may have empty or null values. #208

Browse Source
This commit is contained in:
Willem Wollebrants 2017-08-28 21:52:21 +02:00
parent db089ab271
commit 4cc030c68a
2 changed files with 49 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/Valitron/Validator.php
View File

@ -143,10 +143,16 @@ class Validator
* *
* @param string $field * @param string $field
* @param mixed $value * @param mixed $value
* @param array $params
* @return bool * @return bool
*/ */
protected function validateRequired($field, $value) protected function validateRequired($field, $value, array $params= array(), array $fields = array())
{ {
if (isset($params[0]) && (bool) $params[0]){
$find = $this->getPart($this->_fields, explode('.', $field), true);
return $find[1];
}
if (is_null($value)) { if (is_null($value)) {
return false; return false;
} elseif (is_string($value) && trim($value) === '') { } elseif (is_string($value) && trim($value) === '') {
@ -886,48 +892,49 @@ class Validator
$this->_labels = array(); $this->_labels = array();
} }
protected function getPart($data, $identifiers) protected function getPart($data, $identifiers, $allow_empty = false)
{ {
// Catches the case where the field is an array of discrete values // Catches the case where the field is an array of discrete values
if (is_array($identifiers) && count($identifiers) === 0) { if (is_array($identifiers) && count($identifiers) === 0) {
return array($data, false); return array($data, false);
} }
// Catches the case where the data isn't an array or object // Catches the case where the data isn't an array or object
if (is_scalar($data)) { if (is_scalar($data)) {
return array(NULL, false); return array(NULL, false);
} }
$identifier = array_shift($identifiers); $identifier = array_shift($identifiers);
// Glob match // Glob match
if ($identifier === '*') { if ($identifier === '*') {
$values = array(); $values = array();
foreach ($data as $row) { foreach ($data as $row) {
list($value, $multiple) = $this->getPart($row, $identifiers); list($value, $multiple) = $this->getPart($row, $identifiers, $allow_empty);
if ($multiple) { if ($multiple) {
$values = array_merge($values, $value); $values = array_merge($values, $value);
} else { } else {
$values[] = $value; $values[] = $value;
} }
} }
return array($values, true); return array($values, true);
} }
// Dead end, abort // Dead end, abort
elseif ($identifier === NULL || ! isset($data[$identifier])) { elseif ($identifier === NULL || ! isset($data[$identifier])) {
if ($allow_empty){
//when empty values are allowed, we only care if the key exists
return array(null, array_key_exists($identifier, $data));
}
return array(null, false); return array(null, false);
} }
// Match array element // Match array element
elseif (count($identifiers) === 0) { elseif (count($identifiers) === 0) {
if ($allow_empty){
//when empty values are allowed, we only care if the key exists
return array(null, array_key_exists($identifier, $data));
}
return array($data[$identifier], false); return array($data[$identifier], false);
} }
// We need to go deeper // We need to go deeper
else { else {
return $this->getPart($data[$identifier], $identifiers); return $this->getPart($data[$identifier], $identifiers, $allow_empty);
} }
} }

31
tests/Valitron/ValidateTest.php
View File

@ -1240,6 +1240,37 @@ class ValidateTest extends BaseTestCase
$this->assertFalse($v3->validate()); $this->assertFalse($v3->validate());
$this->assertNotEmpty($v3->errors()); $this->assertNotEmpty($v3->errors());
} }
public function testRequiredEdgeCases()
{
$v = new Validator(array(
'zero'=>0,
'zero_txt' => '0',
'false'=>false,
'empty_array'=>array()
));
$v->rule('required', array('zero', 'zero_txt', 'false', 'empty_array'));
$this->assertTrue($v->validate());
}
public function testRequiredAllowEmpty(){
$data= array(
'empty_text'=>'',
'null_value' => null,
'in_array'=>array(
'empty_text'=>''
)
);
$v1= new Validator($data);
$v1->rule('required', array('empty_text', 'null_value', 'in_array.empty_text'));
$this->assertFalse($v1->validate());
$v2= new Validator($data);
$v2->rule('required', array('empty_text', 'null_value', 'in_array.empty_text'));
$this->assertFalse($v2->validate());
}
} }
function sampleFunctionCallback($field, $value, array $params) { function sampleFunctionCallback($field, $value, array $params) {