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

Modified Set::extract to be available from combine and other functions as well

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6659 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
the_undefined 2008-04-13 18:46:27 +00:00
parent de4807e726
commit 9f040bd395
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cake/libs/set.php
View file

@ -383,9 +383,17 @@ class Set extends Object {
* @access public
*/
function extract($path, $data = null, $options = array()) {
if (is_string($data) && $data{0} == '/') {
$tmp = $path;
$path = $data;
$data = $tmp;
}
if (is_array($path) || empty($data) || is_object($path) || empty($path)) {
return Set::classicExtract($path, $data);
}
if ($path == '/') {
return $data;
}
$contexts = $data;
$options = am(array('flatten' => true), $options);
if (!isset($contexts[0])) {

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

@ -487,6 +487,13 @@ class SetTest extends UnitTestCase {
$expected = array(1, 2, 4, 5);
$r = Set::extract('/Comment[id!=3]/id', $common);
$this->assertEqual($r, $expected);
$r = Set::extract('/', $common);
$this->assertEqual($r, $common);
$expected = array(1, 2, 4, 5);
$r = Set::extract($common, '/Comment[id!=3]/id');
$this->assertEqual($r, $expected);
}
/**
* undocumented function