adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-02-07 12:36:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding tests from 'tfs' fixes inconsistencies in extracting elements with one path selector. Fixes #555

Browse source
This commit is contained in:
Mark Story 2010-04-10 16:57:50 -04:00
parent fbaabad6bb
commit 6c357ee555
2 changed files with 64 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cake/libs/set.php
View file

@ -447,18 +447,18 @@ class Set {
$ctext = array($context['key']); $ctext = array($context['key']);
if (!is_numeric($key)) { if (!is_numeric($key)) {
$ctext[] = $token; $ctext[] = $token;
$token = array_shift($tokens); $tok = array_shift($tokens);
if (isset($items[$token])) { if (isset($items[$tok])) {
$ctext[] = $token; $ctext[] = $tok;
$item = $items[$token]; $item = $items[$tok];
$matches[] = array( $matches[] = array(
'trace' => array_merge($context['trace'], $ctext), 'trace' => array_merge($context['trace'], $ctext),
'key' => $token, 'key' => $tok,
'item' => $item, 'item' => $item,
); );
break; break;
} else { } elseif ($tok !== null) {
array_unshift($tokens, $token); array_unshift($tokens, $tok);
} }
} else { } else {
$key = $token; $key = $token;

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

@ -923,7 +923,6 @@ class SetTest extends CakeTestCase {
) )
) )
); );
$expected = array(array('Category' => $tree[1]['Category'])); $expected = array(array('Category' => $tree[1]['Category']));
$r = Set::extract('/Category[name=Category 2]', $tree); $r = Set::extract('/Category[name=Category 2]', $tree);
$this->assertEqual($r, $expected); $this->assertEqual($r, $expected);
@ -1081,6 +1080,14 @@ class SetTest extends CakeTestCase {
$r = Set::extract('/User/id', $nonZero); $r = Set::extract('/User/id', $nonZero);
$this->assertEqual($r, $expected); $this->assertEqual($r, $expected);
$expected = array(
array('User' => array('id' => 1, 'name' => 'John')),
array('User' => array('id' => 2, 'name' => 'Bob')),
array('User' => array('id' => 3, 'name' => 'Tony')),
);
$result = Set::extract('/User', $nonZero);
$this->assertEqual($result, $expected);
$nonSequential = array( $nonSequential = array(
'User' => array( 'User' => array(
0 => array('id' => 1), 0 => array('id' => 1),
@ -1142,6 +1149,55 @@ class SetTest extends CakeTestCase {
$this->assertEqual(Set::extract('/Level1/Level2', $data), array(array('Level2' => array('test1', 'test2')))); $this->assertEqual(Set::extract('/Level1/Level2', $data), array(array('Level2' => array('test1', 'test2'))));
$this->assertEqual(Set::extract('/Level1/Level2bis', $data), array(array('Level2bis' => array('test3', 'test4')))); $this->assertEqual(Set::extract('/Level1/Level2bis', $data), array(array('Level2bis' => array('test3', 'test4'))));
} }
/**
* test extract() with elements that have non-array children.
*
* @return void
*/
function testExtractWithNonArrayElements() {
$data = array(
'node' => array(
array('foo'),
'bar'
)
);
$result = Set::extract('/node', $data);
$expected = array(
array('node' => array('foo')),
'bar'
);
$this->assertEqual($result, $expected);
$data = array(
'node' => array(
'foo' => array('bar'),
'bar' => array('foo')
)
);
$result = Set::extract('/node', $data);
$expected = array(
array('foo' => array('bar')),
array('bar' => array('foo')),
);
$this->assertEqual($result, $expected);
$data = array(
'node' => array(
'foo' => array(
'bar'
),
'bar' => 'foo'
)
);
$result = Set::extract('/node', $data);
$expected = array(
array('foo' => array('bar')),
'foo'
);
$this->assertEqual($result, $expected);
}
/** /**
* testMatches method * testMatches method
* *