Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-03-01 18:11:25 +01:00
Code Issues Packages Projects Releases Activity

Validation: added new filter option for array keys

Browse Source
This commit is contained in:
Matias Griese
2020-01-28 22:23:49 +02:00
parent d139b0388a
commit 7ef5fa5630
1 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
system/src/Grav/Common/Data/Validation.php
View File

@@ -711,8 +711,9 @@ class Validation
$ignoreEmpty = isset($field['ignore_empty']) && Utils::isPositive($field['ignore_empty']);
$valueType = $params['value_type'] ?? null;
if ($ignoreEmpty || $valueType) {
$values = static::arrayFilterRecurse($values, $valueType, $ignoreEmpty);
$keyType = $params['key_type'] ?? null;
if ($ignoreEmpty || $valueType || $keyType) {
$values = static::arrayFilterRecurse($values, ['value_type' => $valueType, 'key_type' => $keyType, 'ignore_empty' => $ignoreEmpty]);
}
return $values;
@@ -720,21 +721,35 @@ class Validation
/**
* @param array $values
* @param string|null $type
* @param bool $ignoreEmpty
* @param array $params
* @return array
*/
protected static function arrayFilterRecurse(array $values, ?string $type, bool $ignoreEmpty): array
protected static function arrayFilterRecurse(array $values, array $params): array
{
foreach ($values as $key => &$val) {
if ($params['key_type']) {
switch ($params['key_type']) {
case 'int':
$result = is_int($key);
break;
case 'string':
$result = is_string($key);
break;
default:
$result = false;
}
if (!$result) {
unset($values[$key]);
}
}
if (\is_array($val)) {
$val = static::arrayFilterRecurse($val, $type, $ignoreEmpty);
if ($ignoreEmpty && empty($val)) {
$val = static::arrayFilterRecurse($val, $params);
if ($params['ignore_empty'] && empty($val)) {
unset($values[$key]);
}
} else {
if ($type && $val !== '' && $val !== null) {
switch ($type) {
if ($params['value_type'] && $val !== '' && $val !== null) {
switch ($params['value_type']) {
case 'bool':
if (Utils::isPositive($val)) {
$val = true;
@@ -760,7 +775,7 @@ class Validation
}
}
if ($ignoreEmpty && ($val === '' || $val === null)) {
if ($params['ignore_empty'] && ($val === '' || $val === null)) {
unset($values[$key]);
}
}