From d31e4e7f8e78f0ed4497de9ef4a8f3461d2ed6b3 Mon Sep 17 00:00:00 2001 From: Felipe Pena Date: Sat, 6 Nov 2010 00:09:50 +0000 Subject: [PATCH] - Fixed bug #50579 (RegexIterator::REPLACE doesn't work) --- ext/spl/spl_iterators.c | 7 ++++--- ext/spl/tests/bug50579.phpt | 40 +++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 ext/spl/tests/bug50579.phpt diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c index 2c819650ff..5f48e9270d 100755 --- a/ext/spl/spl_iterators.c +++ b/ext/spl/spl_iterators.c @@ -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); 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; if (intern->current.data == NULL) { @@ -1795,8 +1795,8 @@ SPL_METHOD(RegexIterator, accept) break; case REGIT_MODE_REPLACE: - replacement = zend_read_property(intern->std.ce, getThis(), "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); + 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, -1, &count TSRMLS_CC); if (intern->u.regex.flags & REGIT_USE_KEY) { if (intern->current.key_type != HASH_KEY_IS_LONG) { @@ -1810,6 +1810,7 @@ SPL_METHOD(RegexIterator, accept) MAKE_STD_ZVAL(intern->current.data); ZVAL_STRINGL(intern->current.data, result, result_len, 0); } + RETVAL_BOOL(count > 0); } if (intern->u.regex.flags & REGIT_INVERTED) { diff --git a/ext/spl/tests/bug50579.phpt b/ext/spl/tests/bug50579.phpt new file mode 100644 index 0000000000..3045228ef0 --- /dev/null +++ b/ext/spl/tests/bug50579.phpt @@ -0,0 +1,40 @@ +--TEST-- +Bug #50579 (RegexIterator::REPLACE doesn't work) +--FILE-- +'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] -- 2.50.1