adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

reduce code repetition

Browse source
This commit is contained in:
AD7six 2012-01-10 09:47:51 +01:00
parent 5608d63541
commit d534013570
1 changed files with 28 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
lib/Cake/Utility/Set.php
View file

@ -1146,21 +1146,8 @@ class Set {
foreach ($data as $result) {
$result[$options['children']] = array();
$id = $result;
foreach($idKeys as $key) {
$id = $id[$key];
}
$parentId = $result;
foreach($parentKeys as $key) {
if (!isset($parentId[$key])) {
break;
}
$parentId = $parentId[$key];
}
if (!is_scalar($parentId)) {
$parentId = null;
}
$id = Set::getValue($result, $idKeys);
$parentId = Set::getValue($result, $parentKeys);
if (isset($idMap[$id][$options['children']])) {
$idMap[$id] = array_merge($result, (array)$idMap[$id]);
@ -1174,30 +1161,10 @@ class Set {
}
}
$root = $return[0];
foreach($parentKeys as $key) {
if (!isset($root[$key])) {
break;
}
$root = $root[$key];
}
if (!is_scalar($root)) {
$root = null;
}
$root = Set::getValue($return[0], $parentKeys);
foreach ($return as $i => $result) {
$parentId = $result;
foreach($parentKeys as $key) {
if (!isset($parentId[$key])) {
break;
}
$parentId = $parentId[$key];
}
if (!is_scalar($parentId)) {
$parentId = null;
}
$parentId = Set::getValue($result, $parentKeys);
if ($parentId != $root) {
unset($return[$i]);
}
@ -1205,4 +1172,28 @@ class Set {
return $return;
}
/**
* A slimmed down set extract
*
* @param mixed $input an array
* @param mixed $path string or array of array keys
* @return the value at the specified position or null if it doesn't exist
*/
protected static function getValue($input, $path) {
if (is_string($path)) {
$keys = explode('/', trim($path, '/'));
} else {
$keys = $path;
}
$return = $input;
foreach($keys as $key) {
if (!isset($return[$key])) {
return null;
}
$return = $return[$key];
}
return $return;
}
}