diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-01-28 17:19:05 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-01-29 09:43:00 +0100 |
| commit | 83bc092d40671ebe8bc7c5df1ee9c4456c7baf20 (patch) | |
| tree | d531e942d0e7e50d4092f50220db139b5e56ac6f /ext | |
| parent | 6db97f5e3ea3ac9774a06981226a0fe1bca02b38 (diff) | |
| download | php-git-83bc092d40671ebe8bc7c5df1ee9c4456c7baf20.tar.gz | |
Remove deprecated mbregex aliases
These have been deprecated in PHP 7.3 as part of
https://wiki.php.net/rfc/deprecations_php_7_3.
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/mbstring/php_mbregex.h | 16 | ||||
| -rw-r--r-- | ext/mbstring/tests/mb_ereg3.phpt | 52 |
2 files changed, 1 insertions, 67 deletions
diff --git a/ext/mbstring/php_mbregex.h b/ext/mbstring/php_mbregex.h index 5ada93fcc5..47cd4c6e22 100644 --- a/ext/mbstring/php_mbregex.h +++ b/ext/mbstring/php_mbregex.h @@ -41,21 +41,7 @@ PHP_FE(mb_ereg_search_init, arginfo_mb_ereg_search_init) \ PHP_FE(mb_ereg_search_getregs, arginfo_mb_ereg_search_getregs) \ PHP_FE(mb_ereg_search_getpos, arginfo_mb_ereg_search_getpos) \ - PHP_FE(mb_ereg_search_setpos, arginfo_mb_ereg_search_setpos) \ - PHP_DEP_FALIAS(mbregex_encoding, mb_regex_encoding, arginfo_mb_regex_encoding) \ - PHP_DEP_FALIAS(mbereg, mb_ereg, arginfo_mb_ereg) \ - PHP_DEP_FALIAS(mberegi, mb_eregi, arginfo_mb_eregi) \ - PHP_DEP_FALIAS(mbereg_replace, mb_ereg_replace, arginfo_mb_ereg_replace) \ - PHP_DEP_FALIAS(mberegi_replace, mb_eregi_replace, arginfo_mb_eregi_replace) \ - PHP_DEP_FALIAS(mbsplit, mb_split, arginfo_mb_split) \ - PHP_DEP_FALIAS(mbereg_match, mb_ereg_match, arginfo_mb_ereg_match) \ - PHP_DEP_FALIAS(mbereg_search, mb_ereg_search, arginfo_mb_ereg_search) \ - PHP_DEP_FALIAS(mbereg_search_pos, mb_ereg_search_pos, arginfo_mb_ereg_search_pos) \ - PHP_DEP_FALIAS(mbereg_search_regs, mb_ereg_search_regs, arginfo_mb_ereg_search_regs) \ - PHP_DEP_FALIAS(mbereg_search_init, mb_ereg_search_init, arginfo_mb_ereg_search_init) \ - PHP_DEP_FALIAS(mbereg_search_getregs, mb_ereg_search_getregs, arginfo_mb_ereg_search_getregs) \ - PHP_DEP_FALIAS(mbereg_search_getpos, mb_ereg_search_getpos, arginfo_mb_ereg_search_getpos) \ - PHP_DEP_FALIAS(mbereg_search_setpos, mb_ereg_search_setpos, arginfo_mb_ereg_search_setpos) + PHP_FE(mb_ereg_search_setpos, arginfo_mb_ereg_search_setpos) /* }}} */ #define PHP_MBREGEX_MAXCACHE 50 diff --git a/ext/mbstring/tests/mb_ereg3.phpt b/ext/mbstring/tests/mb_ereg3.phpt deleted file mode 100644 index c591563444..0000000000 --- a/ext/mbstring/tests/mb_ereg3.phpt +++ /dev/null @@ -1,52 +0,0 @@ ---TEST-- -mb_ereg() returning matches ---SKIPIF-- -<?php -if (!extension_loaded('mbstring')) die('skip mbstring not enabled'); -if (!function_exists("mb_ereg")) print "skip mb_ereg() not available"; -?> ---FILE-- -<?php - -// Note: This test is identical to mb_ereg2.phpt, but using deprecated mbereg_* aliases. -// Deleted it once the deprecated aliases have been removed. - -$a = -1; $b = -1; $c = -1; -mbereg($a, $b, $c); -var_dump($a, $b, $c); - -mberegi($a, $b, $c); -var_dump($a, $b, $c); - -mbereg_search_init($a, $b, $c); -var_dump($a, $b, $c); - -echo "Done\n"; -?> ---EXPECTF-- -Deprecated: Function mbereg() is deprecated in %s on line %d -int(-1) -int(-1) -array(1) { - [0]=> - string(2) "-1" -} - -Deprecated: Function mberegi() is deprecated in %s on line %d -int(-1) -int(-1) -array(1) { - [0]=> - string(2) "-1" -} - -Deprecated: Function mbereg_search_init() is deprecated in %s on line %d - -Warning: mbereg_search_init() expects parameter 3 to be string, array given in %s on line %d -int(-1) -int(-1) -array(1) { - [0]=> - string(2) "-1" -} -Done |