Skip to content

Commit 83bc092

Browse files
committed
Remove deprecated mbregex aliases
These have been deprecated in PHP 7.3 as part of https://wiki.php.net/rfc/deprecations_php_7_3.
1 parent 6db97f5 commit 83bc092

File tree

3 files changed

+18
-67
lines changed

3 files changed

+18
-67
lines changed

UPGRADING

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,23 @@ PHP 8.0 UPGRADE NOTES
4646
also been removed. Finally, the "func_overload" and "func_overload_list"
4747
entries in mb_get_info() have been removed.
4848
. mb_parse_str() can no longer be used without specifying a result array.
49+
. A number of deprecated mbregex aliases have been removed. See the following
50+
list for which functions should be used instead:
51+
52+
* mbregex_encoding() -> mb_regex_encoding()
53+
* mbereg() -> mb_ereg()
54+
* mberegi() -> mb_eregi()
55+
* mbereg_replace() -> mb_ereg_replace()
56+
* mberegi_replace() -> mb_eregi_replace()
57+
* mbsplit() -> mb_split()
58+
* mbereg_match() -> mb_ereg_match()
59+
* mbereg_search() -> mb_ereg_search()
60+
* mbereg_search_pos() -> mb_ereg_search_pos()
61+
* mbereg_search_regs() -> mb_ereg_search_regs()
62+
* mbereg_search_init() -> mb_ereg_search_init()
63+
* mbereg_search_getregs() -> mb_ereg_search_getregs()
64+
* mbereg_search_getpos() -> mb_ereg_search_getpos()
65+
* mbereg_search_setpos() -> mb_ereg_search_setpos()
4966

5067
- Standard:
5168
. assert() will no longer evaluate string arguments, instead they will be

ext/mbstring/php_mbregex.h

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -41,21 +41,7 @@
4141
PHP_FE(mb_ereg_search_init, arginfo_mb_ereg_search_init) \
4242
PHP_FE(mb_ereg_search_getregs, arginfo_mb_ereg_search_getregs) \
4343
PHP_FE(mb_ereg_search_getpos, arginfo_mb_ereg_search_getpos) \
44-
PHP_FE(mb_ereg_search_setpos, arginfo_mb_ereg_search_setpos) \
45-
PHP_DEP_FALIAS(mbregex_encoding, mb_regex_encoding, arginfo_mb_regex_encoding) \
46-
PHP_DEP_FALIAS(mbereg, mb_ereg, arginfo_mb_ereg) \
47-
PHP_DEP_FALIAS(mberegi, mb_eregi, arginfo_mb_eregi) \
48-
PHP_DEP_FALIAS(mbereg_replace, mb_ereg_replace, arginfo_mb_ereg_replace) \
49-
PHP_DEP_FALIAS(mberegi_replace, mb_eregi_replace, arginfo_mb_eregi_replace) \
50-
PHP_DEP_FALIAS(mbsplit, mb_split, arginfo_mb_split) \
51-
PHP_DEP_FALIAS(mbereg_match, mb_ereg_match, arginfo_mb_ereg_match) \
52-
PHP_DEP_FALIAS(mbereg_search, mb_ereg_search, arginfo_mb_ereg_search) \
53-
PHP_DEP_FALIAS(mbereg_search_pos, mb_ereg_search_pos, arginfo_mb_ereg_search_pos) \
54-
PHP_DEP_FALIAS(mbereg_search_regs, mb_ereg_search_regs, arginfo_mb_ereg_search_regs) \
55-
PHP_DEP_FALIAS(mbereg_search_init, mb_ereg_search_init, arginfo_mb_ereg_search_init) \
56-
PHP_DEP_FALIAS(mbereg_search_getregs, mb_ereg_search_getregs, arginfo_mb_ereg_search_getregs) \
57-
PHP_DEP_FALIAS(mbereg_search_getpos, mb_ereg_search_getpos, arginfo_mb_ereg_search_getpos) \
58-
PHP_DEP_FALIAS(mbereg_search_setpos, mb_ereg_search_setpos, arginfo_mb_ereg_search_setpos)
44+
PHP_FE(mb_ereg_search_setpos, arginfo_mb_ereg_search_setpos)
5945
/* }}} */
6046

6147
#define PHP_MBREGEX_MAXCACHE 50

ext/mbstring/tests/mb_ereg3.phpt

Lines changed: 0 additions & 52 deletions
This file was deleted.

0 commit comments

Comments
 (0)