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

Added regex match support to Set::extract

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6667 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
the_undefined 2008-04-16 19:36:19 +00:00
parent f6c30745fe
commit 5fe0038a74
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cake/libs/set.php
View file

@ -404,7 +404,7 @@ class Set extends Object {
$contexts = array($data); $contexts = array($data);
} }
$tokens = array_slice(explode('/', $path), 1); $tokens = array_slice(preg_split('/(?<!=)\/(?!])/', $path), 1);
do { do {
$token = array_shift($tokens); $token = array_shift($tokens);
$conditions = false; $conditions = false;
@ -503,7 +503,9 @@ class Set extends Object {
return false; return false;
} }
$val = $data[$key]; $val = $data[$key];
if ($op == '=' && $val != $expected) { if ($op == '=' && $expected{0} == '/') {
return preg_match($expected, $val);
} elseif ($op == '=' && $val != $expected) {
return false; return false;
} elseif ($op == '!=' && $val == $expected) { } elseif ($op == '!=' && $val == $expected) {
return false; return false;

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

@ -423,6 +423,10 @@ class SetTest extends UnitTestCase {
$expected = array(4); $expected = array(4);
$r = Set::extract('/User/id', $single); $r = Set::extract('/User/id', $single);
$this->assertEqual($r, $expected); $this->assertEqual($r, $expected);
$expected = array(1, 3);
$r = Set::extract('/User[name=/n/]/id', $tricky);
$this->assertEqual($r, $expected);
$common = array( $common = array(
array( array(