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

Allow character classes in attribute patterns.

Browse source 
Fixes #3706
This commit is contained in:
mark_story 2013-03-14 12:55:03 -04:00
parent 60f9131940
commit 246c09ae40
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -873,6 +873,10 @@ class HashTest extends CakeTestCase {
$result = Hash::extract($data, '{n}.Article[title=/^First/]'); $result = Hash::extract($data, '{n}.Article[title=/^First/]');
$expected = array($data[0]['Article']); $expected = array($data[0]['Article']);
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
$result = Hash::extract($data, '{n}.Article[title=/^Fir[a-z]+/]');
$expected = array($data[0]['Article']);
$this->assertEquals($expected, $result);
} }
/** /**

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

@ -170,7 +170,7 @@ class Hash {
*/ */
protected static function _matches(array $data, $selector) { protected static function _matches(array $data, $selector) {
preg_match_all( preg_match_all(
'/(\[ (?<attr>[^=><!]+?) (\s* (?<op>[><!]?[=]|[><]) \s* (?<val>[^\]]+) )? \])/x', '/(\[ (?<attr>[^=><!]+?) (\s* (?<op>[><!]?[=]|[><]) \s* (?<val>(?:\/.*?\/ | [^\]]+)) )? \])/x',
$selector, $selector,
$conditions, $conditions,
PREG_SET_ORDER PREG_SET_ORDER