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

moving checks for Set::extract() so that null will be returned when empty data is passed and classicExtract is expected.

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8105 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
gwoo 2009-03-15 19:39:35 +00:00
parent 93bf4fd0dc
commit 056402efa7
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cake/libs/set.php
View file

@ -374,12 +374,12 @@ class Set extends Object {
$data = $path; $data = $path;
$path = $tmp; $path = $tmp;
} }
if (empty($data)) {
return array();
}
if (strpos($path, '/') === false) { if (strpos($path, '/') === false) {
return Set::classicExtract($data, $path); return Set::classicExtract($data, $path);
} }
if (empty($data)) {
return array();
}
if ($path === '/') { if ($path === '/') {
return $data; return $data;
} }

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

@ -1052,15 +1052,17 @@ class SetTest extends CakeTestCase {
*/ */
function testSetExtractReturnsEmptyArray() { function testSetExtractReturnsEmptyArray() {
$this->assertEqual(Set::extract(array(), '/Post/id'), array()); $this->assertIdentical(Set::extract(array(), '/Post/id'), array());
$this->assertEqual(Set::extract('/Post/id', array()), array()); $this->assertIdentical(Set::extract('/Post/id', array()), array());
$this->assertEqual(Set::extract('/Post/id', array( $this->assertIdentical(Set::extract('/Post/id', array(
array('Post' => array('name' => 'bob')), array('Post' => array('name' => 'bob')),
array('Post' => array('name' => 'jim')) array('Post' => array('name' => 'jim'))
)), array()); )), array());
$this->assertIdentical(Set::extract(array(), 'Message.flash'), null);
} }
/** /**
* testClassicExtract method * testClassicExtract method