diff options
| author | Stanislav Malyshev <stas@php.net> | 2016-09-05 00:38:57 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2016-09-05 00:38:57 -0700 |
| commit | 92db92c6201c5912e151b2de507c305dc6296efe (patch) | |
| tree | 3b440a8c149dd412ac417b18da683c93cff1719d /ext/pcre | |
| parent | b5f9427ca95a11d809f04c67d2a3446e3cb4df95 (diff) | |
| parent | 39423e425d6caafea3c0b45c2b6ebe4a06a11462 (diff) | |
| download | php-git-92db92c6201c5912e151b2de507c305dc6296efe.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Implement #47456: Missing PCRE option 'J'
Diffstat (limited to 'ext/pcre')
| -rw-r--r-- | ext/pcre/php_pcre.c | 1 | ||||
| -rw-r--r-- | ext/pcre/tests/request47456.phpt | 101 |
2 files changed, 102 insertions, 0 deletions
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index 1ff8ae4654..2ae5b98cd6 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -431,6 +431,7 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache(zend_string *regex) coptions |= PCRE_UCP; #endif break; + case 'J': coptions |= PCRE_DUPNAMES; break; /* Custom preg options */ case 'e': poptions |= PREG_REPLACE_EVAL; break; diff --git a/ext/pcre/tests/request47456.phpt b/ext/pcre/tests/request47456.phpt new file mode 100644 index 0000000000..2ba2627c8d --- /dev/null +++ b/ext/pcre/tests/request47456.phpt @@ -0,0 +1,101 @@ +--TEST-- +Request #47456 (Missing PCRE option 'J') +--DESCRIPTION-- +The J modifier is supposed to be identical to the internal option (?J), so we're +testing both. +--FILE-- +<?php +preg_match_all('/(?J)(?<chr>[ac])(?<num>\d)|(?<chr>[b])/', 'a1bc3', $m, PREG_SET_ORDER); +var_dump($m); + +unset($m); +preg_match_all('/(?<chr>[ac])(?<num>\d)|(?<chr>[b])/J', 'a1bc3', $m, PREG_SET_ORDER); +var_dump($m); +?> +--EXPECT-- +array(3) { + [0]=> + array(5) { + [0]=> + string(2) "a1" + ["chr"]=> + string(1) "a" + [1]=> + string(1) "a" + ["num"]=> + string(1) "1" + [2]=> + string(1) "1" + } + [1]=> + array(6) { + [0]=> + string(1) "b" + ["chr"]=> + string(1) "b" + [1]=> + string(0) "" + ["num"]=> + string(0) "" + [2]=> + string(0) "" + [3]=> + string(1) "b" + } + [2]=> + array(5) { + [0]=> + string(2) "c3" + ["chr"]=> + string(1) "c" + [1]=> + string(1) "c" + ["num"]=> + string(1) "3" + [2]=> + string(1) "3" + } +} +array(3) { + [0]=> + array(5) { + [0]=> + string(2) "a1" + ["chr"]=> + string(1) "a" + [1]=> + string(1) "a" + ["num"]=> + string(1) "1" + [2]=> + string(1) "1" + } + [1]=> + array(6) { + [0]=> + string(1) "b" + ["chr"]=> + string(1) "b" + [1]=> + string(0) "" + ["num"]=> + string(0) "" + [2]=> + string(0) "" + [3]=> + string(1) "b" + } + [2]=> + array(5) { + [0]=> + string(2) "c3" + ["chr"]=> + string(1) "c" + [1]=> + string(1) "c" + ["num"]=> + string(1) "3" + [2]=> + string(1) "3" + } +} |