summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2019-11-29 23:28:28 +0100
committerChristoph M. Becker <cmbecker69@gmx.de>2019-11-29 23:40:30 +0100
commitff2140c49dda22b22ea51ae35fab961b443d282e (patch)
treedd399c63e17e6f7f98a2771aa20032b0bc06f22c
parentc55d09c2f547634b577aa5aeaa1438d772bc29d1 (diff)
downloadphp-git-ff2140c49dda22b22ea51ae35fab961b443d282e.tar.gz
Partially revert "Adapt test cases for Oniguruma 6.9.4"
This partially reverts commit c55d09c2f547634b577aa5aeaa1438d772bc29d1, because `MB_ONIGURUMA_VERSION` is only available as of PHP 7.4.0, so that change made no sense for PHP-7.3; we keep it for PHP-7.4, though. We also stick with the modification to bug78633.phpt.
-rw-r--r--ext/mbstring/tests/mb_ereg_search_named_subpatterns.phpt (renamed from ext/mbstring/tests/mb_ereg_search_named_subpatterns_1.phpt)1
-rw-r--r--ext/mbstring/tests/mb_ereg_search_named_subpatterns_2.phpt32
2 files changed, 0 insertions, 33 deletions
diff --git a/ext/mbstring/tests/mb_ereg_search_named_subpatterns_1.phpt b/ext/mbstring/tests/mb_ereg_search_named_subpatterns.phpt
index f6ab8c0c36..f899e9beeb 100644
--- a/ext/mbstring/tests/mb_ereg_search_named_subpatterns_1.phpt
+++ b/ext/mbstring/tests/mb_ereg_search_named_subpatterns.phpt
@@ -4,7 +4,6 @@ Testing mb_ereg_search() named capture groups
<?php
if (!extension_loaded('mbstring')) die('skip mbstring not enabled');
function_exists('mb_ereg_search') or die("skip mb_ereg_search() is not available in this build");
-version_compare(MB_ONIGURUMA_VERSION, '6.9.4', '<') or die("skip requires oniguruma < 6.9.4");
?>
--FILE--
<?php
diff --git a/ext/mbstring/tests/mb_ereg_search_named_subpatterns_2.phpt b/ext/mbstring/tests/mb_ereg_search_named_subpatterns_2.phpt
deleted file mode 100644
index 78332da662..0000000000
--- a/ext/mbstring/tests/mb_ereg_search_named_subpatterns_2.phpt
+++ /dev/null
@@ -1,32 +0,0 @@
---TEST--
-Testing mb_ereg_search() named capture groups
---SKIPIF--
-<?php
-if (!extension_loaded('mbstring')) die('skip mbstring not enabled');
-function_exists('mb_ereg_search') or die("skip mb_ereg_search() is not available in this build");
-version_compare(MB_ONIGURUMA_VERSION, '6.9.4', '>=') or die("skip requires oniguruma >= 6.9.4");
-?>
---FILE--
-<?php
- mb_regex_encoding("UTF-8");
- mb_ereg_search_init(' 中国?');
- mb_ereg_search('(?<wsp>\s*)(?<word>\w+)(?<punct>[?!])');
- var_dump(mb_ereg_search_getregs());
-?>
---EXPECT--
-array(7) {
- [0]=>
- string(11) " 中国?"
- [1]=>
- string(2) " "
- [2]=>
- string(6) "中国"
- [3]=>
- string(3) "?"
- ["wsp"]=>
- string(2) " "
- ["word"]=>
- string(6) "中国"
- ["punct"]=>
- string(3) "?"
-}