mirror of
https://github.com/vlucas/valitron.git
synced 2025-12-30 23:01:52 +00:00
filter out non-required array parts. Fixes #262
This commit is contained in:
Willem Wollebrants
parent
c5a1664dab
commit
aaf543517d
@ -1,4 +1,5 @@
|
||||
<?php
|
||||
|
||||
namespace Valitron;
|
||||
|
||||
/**
|
||||
@ -105,7 +106,7 @@ class Validator
|
||||
|
||||
// Load language file in directory
|
||||
$langFile = rtrim($langDir, '/') . '/' . $lang . '.php';
|
||||
if (stream_resolve_include_path($langFile) ) {
|
||||
if (stream_resolve_include_path($langFile)) {
|
||||
$langMessages = include $langFile;
|
||||
static::$_ruleMessages = array_merge(static::$_ruleMessages, $langMessages);
|
||||
} else {
|
||||
@ -151,9 +152,9 @@ class Validator
|
||||
* @param array $params
|
||||
* @return bool
|
||||
*/
|
||||
protected function validateRequired($field, $value, $params= array())
|
||||
protected function validateRequired($field, $value, $params = array())
|
||||
{
|
||||
if (isset($params[0]) && (bool) $params[0]){
|
||||
if (isset($params[0]) && (bool)$params[0]) {
|
||||
$find = $this->getPart($this->_fields, explode('.', $field), true);
|
||||
return $find[1];
|
||||
}
|
||||
@ -249,7 +250,7 @@ class Validator
|
||||
*/
|
||||
protected function validateInteger($field, $value, $params)
|
||||
{
|
||||
if (isset($params[0]) && (bool) $params[0]){
|
||||
if (isset($params[0]) && (bool)$params[0]) {
|
||||
//strict mode
|
||||
return preg_match('/^([0-9]|-[1-9]|-?[1-9][0-9]*)$/i', $value);
|
||||
}
|
||||
@ -387,7 +388,6 @@ class Validator
|
||||
* @param string $field
|
||||
* @param mixed $value
|
||||
* @param array $params
|
||||
|
||||
* @return bool
|
||||
*/
|
||||
protected function validateBetween($field, $value, $params)
|
||||
@ -461,7 +461,7 @@ class Validator
|
||||
|
||||
$strict = true;
|
||||
if (isset($params[1])) {
|
||||
$strict = (bool) $params[1];
|
||||
$strict = (bool)$params[1];
|
||||
}
|
||||
|
||||
$isContains = false;
|
||||
@ -596,7 +596,7 @@ class Validator
|
||||
*/
|
||||
protected function validateSlug($field, $value)
|
||||
{
|
||||
if(is_array($value)) {
|
||||
if (is_array($value)) {
|
||||
return false;
|
||||
}
|
||||
return preg_match('/^([-a-z0-9_-])+$/i', $value);
|
||||
@ -741,7 +741,7 @@ class Validator
|
||||
return false;
|
||||
}
|
||||
for ($i = 0; $i < $strlen; $i++) {
|
||||
$digit = (int) substr($number, $strlen - $i - 1, 1);
|
||||
$digit = (int)substr($number, $strlen - $i - 1, 1);
|
||||
if ($i % 2 == 1) {
|
||||
$sub_total = $digit * 2;
|
||||
if ($sub_total > 9) {
|
||||
@ -827,7 +827,8 @@ class Validator
|
||||
}
|
||||
|
||||
//Validate optional field
|
||||
protected function validateOptional($field, $value, $params) {
|
||||
protected function validateOptional($field, $value, $params)
|
||||
{
|
||||
//Always return true
|
||||
return true;
|
||||
}
|
||||
@ -940,24 +941,21 @@ class Validator
|
||||
}
|
||||
}
|
||||
return array($values, true);
|
||||
}
|
||||
// Dead end, abort
|
||||
elseif ($identifier === NULL || ! isset($data[$identifier])) {
|
||||
if ($allow_empty){
|
||||
} // Dead end, abort
|
||||
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);
|
||||
}
|
||||
// Match array element
|
||||
} // Match array element
|
||||
elseif (count($identifiers) === 0) {
|
||||
if ($allow_empty){
|
||||
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);
|
||||
}
|
||||
// We need to go deeper
|
||||
return array($data[$identifier], $allow_empty);
|
||||
} // We need to go deeper
|
||||
else {
|
||||
return $this->getPart($data[$identifier], $identifiers, $allow_empty);
|
||||
}
|
||||
@ -973,7 +971,7 @@ class Validator
|
||||
$set_to_break = false;
|
||||
foreach ($this->_validations as $v) {
|
||||
foreach ($v['fields'] as $field) {
|
||||
list($values, $multiple) = $this->getPart($this->_fields, explode('.', $field));
|
||||
list($values, $multiple) = $this->getPart($this->_fields, explode('.', $field), false);
|
||||
|
||||
// Don't validate if the field is not required and the value is empty
|
||||
if ($this->hasRule('optional', $field) && isset($values)) {
|
||||
@ -981,7 +979,7 @@ class Validator
|
||||
} elseif (
|
||||
$v['rule'] !== 'required' && !$this->hasRule('required', $field) &&
|
||||
$v['rule'] !== 'accepted' &&
|
||||
(! isset($values) || $values === '' || ($multiple && count($values) == 0))
|
||||
(!isset($values) || $values === '' || ($multiple && count($values) == 0))
|
||||
) {
|
||||
continue;
|
||||
}
|
||||
@ -996,6 +994,8 @@ class Validator
|
||||
|
||||
if (!$multiple) {
|
||||
$values = array($values);
|
||||
} else if (! $this->hasRule('required', $field)){
|
||||
$values = array_filter($values);
|
||||
}
|
||||
|
||||
$result = true;
|
||||
@ -1005,13 +1005,13 @@ class Validator
|
||||
|
||||
if (!$result) {
|
||||
$this->error($field, $v['message'], $v['params']);
|
||||
if($this->stop_on_first_fail) {
|
||||
if ($this->stop_on_first_fail) {
|
||||
$set_to_break = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if($set_to_break) break;
|
||||
if ($set_to_break) break;
|
||||
}
|
||||
|
||||
return count($this->errors()) === 0;
|
||||
@ -1021,8 +1021,9 @@ class Validator
|
||||
* Should the validation stop a rule is failed
|
||||
* @param bool $stop
|
||||
*/
|
||||
public function stopOnFirstFail($stop = true) {
|
||||
$this->stop_on_first_fail = (bool) $stop;
|
||||
public function stopOnFirstFail($stop = true)
|
||||
{
|
||||
$this->stop_on_first_fail = (bool)$stop;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -1101,8 +1102,7 @@ class Validator
|
||||
*/
|
||||
public static function addRule($name, $callback, $message = null)
|
||||
{
|
||||
if ($message === null)
|
||||
{
|
||||
if ($message === null) {
|
||||
$message = static::ERROR_DEFAULT;
|
||||
}
|
||||
|
||||
@ -1114,16 +1114,14 @@ class Validator
|
||||
|
||||
public function getUniqueRuleName($fields)
|
||||
{
|
||||
if (is_array($fields))
|
||||
{
|
||||
if (is_array($fields)) {
|
||||
$fields = implode("_", $fields);
|
||||
}
|
||||
|
||||
$orgName = "{$fields}_rule";
|
||||
$name = $orgName;
|
||||
$rules = $this->getRules();
|
||||
while (isset($rules[$name]))
|
||||
{
|
||||
while (isset($rules[$name])) {
|
||||
$name = $orgName . "_" . rand(0, 10000);
|
||||
}
|
||||
|
||||
@ -1158,8 +1156,7 @@ class Validator
|
||||
$params = array_slice(func_get_args(), 2);
|
||||
|
||||
if (is_callable($rule)
|
||||
&& !(is_string($rule) && $this->hasValidator($rule)))
|
||||
{
|
||||
&& !(is_string($rule) && $this->hasValidator($rule))) {
|
||||
$name = $this->getUniqueRuleName($fields);
|
||||
$msg = isset($params[0]) ? $params[0] : null;
|
||||
$this->addInstanceRule($name, $rule, $msg);
|
||||
@ -1190,8 +1187,8 @@ class Validator
|
||||
|
||||
$this->_validations[] = array(
|
||||
'rule' => $rule,
|
||||
'fields' => (array) $fields,
|
||||
'params' => (array) $params,
|
||||
'fields' => (array)$fields,
|
||||
'params' => (array)$params,
|
||||
'message' => $message
|
||||
);
|
||||
|
||||
@ -1240,7 +1237,7 @@ class Validator
|
||||
if (is_array($params)) {
|
||||
$i = 1;
|
||||
foreach ($params as $k => $v) {
|
||||
$tag = '{field'. $i .'}';
|
||||
$tag = '{field' . $i . '}';
|
||||
$label = isset($params[$k]) && (is_numeric($params[$k]) || is_string($params[$k])) && isset($this->_labels[$params[$k]]) ? $this->_labels[$params[$k]] : $tag;
|
||||
$msg = str_replace($tag, $label, $msg);
|
||||
$i++;
|
||||
@ -1263,8 +1260,8 @@ class Validator
|
||||
foreach ($rules as $ruleType => $params) {
|
||||
if (is_array($params)) {
|
||||
foreach ($params as $innerParams) {
|
||||
if (! is_array($innerParams)){
|
||||
$innerParams = (array) $innerParams;
|
||||
if (!is_array($innerParams)) {
|
||||
$innerParams = (array)$innerParams;
|
||||
}
|
||||
array_unshift($innerParams, $ruleType);
|
||||
call_user_func_array(array($this, 'rule'), $innerParams);
|
||||
@ -1296,10 +1293,11 @@ class Validator
|
||||
* @param string field_name
|
||||
* @param array $rules
|
||||
*/
|
||||
public function mapFieldRules($field_name, $rules){
|
||||
public function mapFieldRules($field_name, $rules)
|
||||
{
|
||||
$me = $this;
|
||||
|
||||
array_map(function($rule) use($field_name, $me){
|
||||
array_map(function ($rule) use ($field_name, $me) {
|
||||
|
||||
//rule must be an array
|
||||
$rule = (array)$rule;
|
||||
@ -1309,16 +1307,16 @@ class Validator
|
||||
|
||||
//find a custom message, if any
|
||||
$message = null;
|
||||
if (isset($rule['message'])){
|
||||
if (isset($rule['message'])) {
|
||||
$message = $rule['message'];
|
||||
unset($rule['message']);
|
||||
}
|
||||
//Add the field and additional parameters to the rule
|
||||
$added = call_user_func_array(array($me, 'rule'), array_merge(array($rule_name, $field_name), $rule));
|
||||
if (! empty($message)){
|
||||
if (!empty($message)) {
|
||||
$added->message($message);
|
||||
}
|
||||
}, (array) $rules);
|
||||
}, (array)$rules);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -1326,9 +1324,10 @@ class Validator
|
||||
*
|
||||
* @param array $rules
|
||||
*/
|
||||
public function mapFieldsRules($rules){
|
||||
public function mapFieldsRules($rules)
|
||||
{
|
||||
$me = $this;
|
||||
array_map(function($field_name) use($rules, $me){
|
||||
array_map(function ($field_name) use ($rules, $me) {
|
||||
$me->mapFieldRules($field_name, $rules[$field_name]);
|
||||
}, array_keys($rules));
|
||||
}
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
<?php
|
||||
|
||||
use Valitron\Validator;
|
||||
|
||||
class ValidateTest extends BaseTestCase
|
||||
@ -21,6 +22,7 @@ class ValidateTest extends BaseTestCase
|
||||
$v->rule('required', 'name');
|
||||
$this->assertFalse($v->errors('name'));
|
||||
}
|
||||
|
||||
public function testArrayOfFieldsToValidate()
|
||||
{
|
||||
$v = new Validator(array('name' => 'Chester Tester', 'email' => 'chester@tester.com'));
|
||||
@ -158,7 +160,8 @@ class ValidateTest extends BaseTestCase
|
||||
$this->assertFalse($v->validate());
|
||||
}
|
||||
|
||||
public function testAcceptedNotSet(){
|
||||
public function testAcceptedNotSet()
|
||||
{
|
||||
$v = new Validator();
|
||||
$v->rule('accepted', 'agree');
|
||||
$this->assertFalse($v->validate());
|
||||
@ -189,7 +192,8 @@ class ValidateTest extends BaseTestCase
|
||||
$this->assertTrue($v->validate());
|
||||
}
|
||||
|
||||
public function testIntegerStrict(){
|
||||
public function testIntegerStrict()
|
||||
{
|
||||
|
||||
$v = new Validator(array('num' => ' 41243'));
|
||||
$v->rule('integer', 'num');
|
||||
@ -645,13 +649,15 @@ class ValidateTest extends BaseTestCase
|
||||
$this->assertFalse($v->validate());
|
||||
}
|
||||
|
||||
public function testEmailDnsValid(){
|
||||
public function testEmailDnsValid()
|
||||
{
|
||||
$v = new Validator(array('name' => 'Chester Tester', 'email' => 'chester@tester.com'));
|
||||
$v->rule('emailDNS', 'email');
|
||||
$this->assertTrue($v->validate());
|
||||
}
|
||||
|
||||
public function testEmailDnsInvalid(){
|
||||
public function testEmailDnsInvalid()
|
||||
{
|
||||
$v = new Validator(array('name' => 'Chester Tester', 'email' => 'chester@tester.zyx'));
|
||||
$v->rule('emailDNS', 'email');
|
||||
$this->assertFalse($v->validate());
|
||||
@ -995,11 +1001,12 @@ class ValidateTest extends BaseTestCase
|
||||
$this->assertEquals($v1->errors(), $v2->errors());
|
||||
}
|
||||
|
||||
public function testMalformedBulkRules(){
|
||||
public function testMalformedBulkRules()
|
||||
{
|
||||
$v = new Validator();
|
||||
$v->rules(
|
||||
array(
|
||||
'required'=>array('foo', 'bar')
|
||||
'required' => array('foo', 'bar')
|
||||
)
|
||||
);
|
||||
|
||||
@ -1053,7 +1060,9 @@ class ValidateTest extends BaseTestCase
|
||||
public function testAddRuleClosure()
|
||||
{
|
||||
$v = new Validator(array('name' => 'Chester Tester'));
|
||||
$v->addRule('testRule', function() { return true; });
|
||||
$v->addRule('testRule', function () {
|
||||
return true;
|
||||
});
|
||||
$v->rule('testRule', 'name');
|
||||
$this->assertTrue($v->validate());
|
||||
}
|
||||
@ -1061,7 +1070,9 @@ class ValidateTest extends BaseTestCase
|
||||
public function testAddRuleClosureReturnsFalse()
|
||||
{
|
||||
$v = new Validator(array('name' => 'Chester Tester'));
|
||||
$v->addRule('testRule', function() { return false; });
|
||||
$v->addRule('testRule', function () {
|
||||
return false;
|
||||
});
|
||||
$v->rule('testRule', 'name');
|
||||
$this->assertFalse($v->validate());
|
||||
}
|
||||
@ -1069,7 +1080,9 @@ class ValidateTest extends BaseTestCase
|
||||
public function testAddRuleClosureWithFieldArray()
|
||||
{
|
||||
$v = new Validator(array('name' => 'Chester Tester', 'email' => 'foo@example.com'));
|
||||
$v->addRule('testRule', function() { return true; });
|
||||
$v->addRule('testRule', function () {
|
||||
return true;
|
||||
});
|
||||
$v->rule('testRule', array('name', 'email'));
|
||||
$this->assertTrue($v->validate());
|
||||
}
|
||||
@ -1077,7 +1090,9 @@ class ValidateTest extends BaseTestCase
|
||||
public function testAddRuleClosureWithArrayAsExtraParameter()
|
||||
{
|
||||
$v = new Validator(array('name' => 'Chester Tester'));
|
||||
$v->addRule('testRule', function() { return true; });
|
||||
$v->addRule('testRule', function () {
|
||||
return true;
|
||||
});
|
||||
$v->rule('testRule', 'name', array('foo', 'bar'));
|
||||
$this->assertTrue($v->validate());
|
||||
}
|
||||
@ -1090,8 +1105,16 @@ class ValidateTest extends BaseTestCase
|
||||
$this->assertTrue($v->validate());
|
||||
}
|
||||
|
||||
public function sampleObjectCallback() { return true; }
|
||||
public function sampleObjectCallbackFalse() { return false; }
|
||||
public function sampleObjectCallback()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
public function sampleObjectCallbackFalse()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
public function testAddRuleCallbackArray()
|
||||
{
|
||||
$v = new Validator(array('name' => 'Chester Tester'));
|
||||
@ -1162,7 +1185,7 @@ class ValidateTest extends BaseTestCase
|
||||
$discover = array(6011712400392605, 6011536340491809, 6011785775263015, 6011984124619056, 6011320958064251);
|
||||
|
||||
foreach (compact('visa', 'mastercard', 'amex', 'dinersclub', 'discover') as $type => $numbers) {
|
||||
foreach($numbers as $number) {
|
||||
foreach ($numbers as $number) {
|
||||
$v = new Validator(array('test' => $number));
|
||||
$v->rule('creditCard', 'test');
|
||||
$this->assertTrue($v->validate());
|
||||
@ -1186,7 +1209,7 @@ class ValidateTest extends BaseTestCase
|
||||
$discover = array(5011712400392605, 5011536340491809, 5011785775263015, 5011984124619056, 5011320958064251);
|
||||
|
||||
foreach (compact('visa', 'mastercard', 'amex', 'dinersclub', 'discover') as $type => $numbers) {
|
||||
foreach($numbers as $number) {
|
||||
foreach ($numbers as $number) {
|
||||
$v = new Validator(array('test' => $number));
|
||||
$v->rule('creditCard', 'test');
|
||||
$this->assertFalse($v->validate());
|
||||
@ -1341,30 +1364,31 @@ class ValidateTest extends BaseTestCase
|
||||
public function testRequiredEdgeCases()
|
||||
{
|
||||
$v = new Validator(array(
|
||||
'zero'=>0,
|
||||
'zero' => 0,
|
||||
'zero_txt' => '0',
|
||||
'false'=>false,
|
||||
'empty_array'=>array()
|
||||
'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'=>'',
|
||||
public function testRequiredAllowEmpty()
|
||||
{
|
||||
$data = array(
|
||||
'empty_text' => '',
|
||||
'null_value' => null,
|
||||
'in_array'=>array(
|
||||
'empty_text'=>''
|
||||
'in_array' => array(
|
||||
'empty_text' => ''
|
||||
)
|
||||
);
|
||||
|
||||
$v1= new Validator($data);
|
||||
$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 = new Validator($data);
|
||||
$v2->rule('required', array('empty_text', 'null_value', 'in_array.empty_text'), true);
|
||||
$this->assertTrue($v2->validate());
|
||||
}
|
||||
@ -1457,8 +1481,41 @@ class ValidateTest extends BaseTestCase
|
||||
$this->assertFalse($v->validate());
|
||||
}
|
||||
|
||||
/**
|
||||
* @see https://github.com/vlucas/valitron/issues/262
|
||||
*/
|
||||
public function testOptionalArrayPartsAreIgnored()
|
||||
{
|
||||
$v = new Validator(array(
|
||||
'data' => array(
|
||||
array('foo' => '2018-01-01'),
|
||||
array('bar' => 1)
|
||||
)
|
||||
)
|
||||
);
|
||||
$v->rule('date', 'data.*.foo');
|
||||
$this->assertTrue($v->validate());
|
||||
}
|
||||
|
||||
/**
|
||||
* @see https://github.com/vlucas/valitron/issues/262
|
||||
*/
|
||||
public function testRequiredArrayPartsAreNotIgnored()
|
||||
{
|
||||
$v = new Validator(array(
|
||||
'data' => array(
|
||||
array('foo' => '2018-01-01'),
|
||||
array('bar' => 1)
|
||||
)
|
||||
)
|
||||
);
|
||||
$v->rule('required', 'data.*.foo');
|
||||
$v->rule('date', 'data.*.foo');
|
||||
$this->assertFalse($v->validate());
|
||||
}
|
||||
}
|
||||
|
||||
function sampleFunctionCallback($field, $value, array $params) {
|
||||
function sampleFunctionCallback($field, $value, array $params)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user