php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-26 06:15:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix #17829: yii\helpers\ArrayHelper::filter now correctly filters data when passing a filter with more than 2 levels

Browse Source
This commit is contained in:
rhertogh
2020-01-28 23:03:31 +01:00
committed by Alexander Makarov
parent b1da57ddf9
commit b794d76056
4 changed files with 154 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
framework/helpers/BaseArrayHelper.php
View File

@ -923,41 +923,49 @@ class BaseArrayHelper
public static function filter($array, $filters)
{
$result = [];
$forbiddenVars = [];
$excludeFilters = [];
foreach ($filters as $var) {
$keys = explode('.', $var);
$globalKey = $keys[0];
$localKey = isset($keys[1]) ? $keys[1] : null;
if ($globalKey[0] === '!') {
$forbiddenVars[] = [
substr($globalKey, 1),
$localKey,
];
foreach ($filters as $filter) {
if ($filter[0] === '!') {
$excludeFilters[] = substr($filter, 1);
continue;
}
if (!array_key_exists($globalKey, $array)) {
continue;
$nodeValue = $array; //set $array as root node
$keys = explode('.', $filter);
foreach ($keys as $key) {
if (!array_key_exists($key, $nodeValue)) {
continue 2; //Jump to next filter
}
$nodeValue = $nodeValue[$key];
}
if ($localKey === null) {
$result[$globalKey] = $array[$globalKey];
continue;
//We've found a value now let's insert it
$resultNode = &$result;
foreach ($keys as $key) {
if (!array_key_exists($key, $resultNode)) {
$resultNode[$key] = [];
}
$resultNode = &$resultNode[$key];
}
if (!isset($array[$globalKey][$localKey])) {
continue;
}
if (!array_key_exists($globalKey, $result)) {
$result[$globalKey] = [];
}
$result[$globalKey][$localKey] = $array[$globalKey][$localKey];
$resultNode = $nodeValue;
}
foreach ($forbiddenVars as $var) {
list($globalKey, $localKey) = $var;
if (array_key_exists($globalKey, $result)) {
unset($result[$globalKey][$localKey]);
foreach ($excludeFilters as $filter) {
$excludeNode = &$result;
$keys = explode('.', $filter);
$numNestedKeys = count($keys) - 1;
foreach ($keys as $i => $key) {
if (!array_key_exists($key, $excludeNode)) {
continue 2; //Jump to next filter
}
if ($i < $numNestedKeys) {
$excludeNode = &$excludeNode[$key];
} else {
unset($excludeNode[$key]);
break;
}
}
}