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

You should be able to regex match null/''

Browse source 
Fixes #2926
This commit is contained in:
mark_story 2012-05-30 21:28:18 -04:00
parent 9a8ceaeba6
commit 01b3135a63
2 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lib/Cake/Test/Case/Utility/HashTest.php
View file

@ -846,6 +846,29 @@ class HashTest extends CakeTestCase {
$this->assertEquals($expected, $result);
}
/**
* Test that extract() + matching can hit null things.
*/
public function testExtractMatchesNull() {
$data = array(
'Country' => array(
array('name' => 'Canada'),
array('name' => 'Australia'),
array('name' => null),
)
);
$result = Hash::extract($data, 'Country.{n}[name=/Canada|^$/]');
$expected = array(
array(
'name' => 'Canada',
),
array(
'name' => null,
),
);
$this->assertEquals($expected, $result);
}
/**
* Test that uneven keys are handled correctly.
*

2
lib/Cake/Utility/Hash.php
View file

@ -192,7 +192,7 @@ class Hash {
}
// Empty attribute = fail.
if (!isset($data[$attr])) {
if (!(isset($data[$attr]) || array_key_exists($attr, $data))) {
return false;
}