summaryrefslogtreecommitdiff
path: root/sapi
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2015-03-21 14:01:11 +0800
committerXinchen Hui <laruence@php.net>2015-03-21 14:01:11 +0800
commitc524dd6d1efd31124803bb316c04970c35ad5b7b (patch)
tree724a343d70c1c27af3232219f331209f3d8eeac4 /sapi
parent775a257cef53a0e22390c49e038b412c687c475c (diff)
parent25566c67fef76e01a25816b95e68a73a7cc2b64e (diff)
downloadphp-git-c524dd6d1efd31124803bb316c04970c35ad5b7b.tar.gz
Merge branch 'rfc-preg-replace-callback-array' of https://github.com/zxcvdavid/php-src
Conflicts: Zend/zend_vm_gen.php ext/pcre/php_pcre.c
Diffstat (limited to 'sapi')
-rw-r--r--sapi/cli/tests/006.phpt9
1 files changed, 9 insertions, 0 deletions
diff --git a/sapi/cli/tests/006.phpt b/sapi/cli/tests/006.phpt
index e9e8b7e219..516ccfd806 100644
--- a/sapi/cli/tests/006.phpt
+++ b/sapi/cli/tests/006.phpt
@@ -97,6 +97,15 @@ string(%d) "Extension [ <persistent> extension #%d pcre version <no_version> ] {
Parameter #4 [ <optional> &$count ]
}
}
+ Function [ <internal:pcre> preg_replace_callback_array ] {
+
+ - Parameters [4] {
+ Parameter #0 [ <required> $pattern ]
+ Parameter #1 [ <required> $subject ]
+ Parameter #2 [ <optional> $limit ]
+ Parameter #3 [ <optional> &$count ]
+ }
+ }
Function [ <internal:pcre> function preg_filter ] {
- Parameters [5] {