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

Partial fix for #5225

Browse source 
Corrected expected behavior for 2nd issue

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7633 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
the_undefined 2008-09-19 18:08:27 +00:00
parent 931d996d90
commit 740bd4e769
2 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cake/libs/set.php
View file

@ -397,6 +397,9 @@ class Set extends Object {
$context = array('trace' => array(), 'item' => $context, 'key' => null);
}
if ($token === '..') {
if (count($context['trace']) == 1) {
$context['trace'][] = $context['key'];
}
$parent = join('/', $context['trace']).'['.($key+1).']';
$context['item'] = Set::extract($parent, $data);
$context['key'] = array_pop($context['trace']);

18
cake/tests/cases/libs/set.test.php
View file

@ -727,20 +727,8 @@ class SetTest extends CakeTestCase {
)
)
);
$expected = array(
array(
'Category' => array(
'name' => 'Category 2'
),
'children' => array(
array(
'Category' => array(
'name' => 'Category 2.1'
)
)
)
)
);
$expected = array(array('Category' => $tree[0]['Category']));
$r = Set::extract('/Category[name=Category 2]/..', $tree);
$this->assertEqual($r, $expected);
@ -751,7 +739,7 @@ class SetTest extends CakeTestCase {
)
)
);
$r = Set::extract('/Category[name=Category 2]/../children/.', $tree);
$r = Set::extract('/Category[name=Category 2]/../../children', $tree);
$this->assertEqual($r, $expected);
}
/**