clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 10:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed bug #50579 (RegexIterator::REPLACE doesn't work)

Browse Source
This commit is contained in:
Felipe Pena 2010-11-06 00:09:50 +00:00
parent bcb4c8427e
commit d31e4e7f8e
2 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ext/spl/spl_iterators.c
View File

@ -1732,7 +1732,7 @@ SPL_METHOD(RegexIterator, accept)
{ {
spl_dual_it_object *intern = (spl_dual_it_object*)zend_object_store_get_object(getThis() TSRMLS_CC); spl_dual_it_object *intern = (spl_dual_it_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
char *subject, tmp[32], *result; char *subject, tmp[32], *result;
int subject_len, use_copy, count, result_len; int subject_len, use_copy, count = 0, result_len;
zval subject_copy, zcount, *replacement; zval subject_copy, zcount, *replacement;
if (intern->current.data == NULL) { if (intern->current.data == NULL) {
@ -1795,8 +1795,8 @@ SPL_METHOD(RegexIterator, accept)
break; break;
case REGIT_MODE_REPLACE: case REGIT_MODE_REPLACE:
replacement = zend_read_property(intern->std.ce, getThis(), "replacement", sizeof("replacement")-1, 1 TSRMLS_CC); replacement = zend_read_property(intern->std.ce, intern->inner.zobject, "replacement", sizeof("replacement")-1, 1 TSRMLS_CC);
result = php_pcre_replace_impl(intern->u.regex.pce, subject, subject_len, replacement, 0, &result_len, 0, NULL TSRMLS_CC); result = php_pcre_replace_impl(intern->u.regex.pce, subject, subject_len, replacement, 0, &result_len, -1, &count TSRMLS_CC);
if (intern->u.regex.flags & REGIT_USE_KEY) { if (intern->u.regex.flags & REGIT_USE_KEY) {
if (intern->current.key_type != HASH_KEY_IS_LONG) { if (intern->current.key_type != HASH_KEY_IS_LONG) {
@ -1810,6 +1810,7 @@ SPL_METHOD(RegexIterator, accept)
MAKE_STD_ZVAL(intern->current.data); MAKE_STD_ZVAL(intern->current.data);
ZVAL_STRINGL(intern->current.data, result, result_len, 0); ZVAL_STRINGL(intern->current.data, result, result_len, 0);
} }
RETVAL_BOOL(count > 0);
} }
if (intern->u.regex.flags & REGIT_INVERTED) { if (intern->u.regex.flags & REGIT_INVERTED) {

40
ext/spl/tests/bug50579.phpt Normal file
View File

@ -0,0 +1,40 @@
--TEST--
Bug #50579 (RegexIterator::REPLACE doesn't work)
--FILE--
<?php
class foo extends ArrayIterator {
public function __construct( ) {
parent::__construct(array(
'test1'=>'test888',
'test2'=>'what?',
'test3'=>'test999'));
$this->replacement = '[$1]';
}
}
$h = new foo;
$i = new RegexIterator($h, '/^test(.*)/', RegexIterator::REPLACE);
$h->replacement = '[$0]';
foreach ($i as $name=>$value) {
echo $name . '=>' . $value . "\n";
}
$h->replacement = '$1';
foreach ($i as $name=>$value) {
echo $name . '=>' . $value . "\n";
}
$h = new foo;
$i = new RegexIterator($h, '/^test(.*)/', RegexIterator::REPLACE);
foreach ($i as $name=>$value) {
echo $name . '=>' . $value . "\n";
}
?>
--EXPECTF--
test1=>[test888]
test3=>[test999]
test1=>888
test3=>999
test1=>[888]
test3=>[999]