adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 09:06:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed Set::extract() where single numeric keys (everything not 0) were skipped. Fixes #1175

Browse source 
Signed-off-by: mark_story <mark@mark-story.com>
This commit is contained in:
Phally 2010-10-06 13:19:54 +02:00 • committed by mark_story
parent 36737e6419
commit 0e5613f63d
2 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cake/libs/set.php
View file

@ -389,7 +389,7 @@ class Set {
$options = array_merge(array('flatten' => true), $options);
if (!isset($contexts[0])) {
$current = current($data);
if ((is_array($current) && count($data) <= 1) || !is_array($current) || !Set::numeric(array_keys($data))) {
if ((is_array($current) && count($data) < 1) || !is_array($current) || !Set::numeric(array_keys($data))) {
$contexts = array($data);
}
}

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

@ -1132,6 +1132,27 @@ class SetTest extends CakeTestCase {
$expected = array(0 => array('Article' => array('id' => 1, 'approved' => 1)));
$result = Set::extract('/Article[approved=1]', $startingAtOne);
$this->assertEqual($result, $expected);
$items = array(
240 => array(
'A' => array(
'field1' => 'a240',
'field2' => 'a240',
),
'B' => array(
'field1' => 'b240',
'field2' => 'b240'
),
)
);
$expected = array(
0 => 'b240'
);
$result = Set::extract('/B/field1', $items);
$this->assertIdentical($result, $expected);
$this->assertIdentical($result, Set::extract('{n}.B.field1', $items));
}
/**
* testExtractWithArrays method