tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Tweaked the other flattening method as well, allowing keys to be preserved

Browse Source
This commit is contained in:
Andreas Gerhards 2018-06-18 11:16:20 +12:00
parent 1753bb2d07
commit 59fe36ba04
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/ORM/ArrayLib.php
View File

@ -75,22 +75,14 @@ class ArrayLib
}
/**
* Flattens a nested array to a one level array
* Flattens a multi-dimensional array to a one level array without preserving the keys
*
* @param array $array
* @return array
*/
public static function array_values_recursive($array)
{
$valuesArray = [];
array_walk_recursive($array, function($value, $key) use (&$valuesArray) {
if (is_scalar($value)) {
array_push($valuesArray, $value);
}
});
return $valuesArray;
return self::flatten($array, false);
}
/**
@ -240,17 +232,18 @@ class ArrayLib
*/
public static function flatten($array, $preserveKeys = true, &$out = array())
{
foreach ($array as $key => $child) {
if (is_array($child)) {
$out = self::flatten($child, $preserveKeys, $out);
} else {
if ($preserveKeys) {
$out[$key] = $child;
array_walk_recursive(
$array,
function ($value, $key) use (&$out, $preserveKeys) {
if (!is_scalar($value)) {
// Do nothing
} elseif ($preserveKeys) {
$out[$key] = $value;
} else {
$out[] = $child;
$out[] = $value;
}
}
}
);
return $out;
}