Skip to content

Commit e6016ab

Browse files
nikicnikic
committed
Deprecate undocumented mbereg_* aliases
Part of https://wiki.php.net/rfc/deprecations_php_7_3.
1 parent fef2029 commit e6016ab

File tree

6 files changed

+38
-27
lines changed

6 files changed

+38
-27
lines changed

‎ext/mbstring/php_mbregex.h

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -44,20 +44,20 @@
4444
PHP_FE(mb_ereg_search_getregs, arginfo_mb_ereg_search_getregs) \
4545
PHP_FE(mb_ereg_search_getpos, arginfo_mb_ereg_search_getpos) \
4646
PHP_FE(mb_ereg_search_setpos, arginfo_mb_ereg_search_setpos) \
47-
PHP_FALIAS(mbregex_encoding, mb_regex_encoding, arginfo_mb_regex_encoding) \
48-
PHP_FALIAS(mbereg, mb_ereg, arginfo_mb_ereg) \
49-
PHP_FALIAS(mberegi, mb_eregi, arginfo_mb_eregi) \
50-
PHP_FALIAS(mbereg_replace, mb_ereg_replace, arginfo_mb_ereg_replace) \
51-
PHP_FALIAS(mberegi_replace, mb_eregi_replace, arginfo_mb_eregi_replace) \
52-
PHP_FALIAS(mbsplit, mb_split, arginfo_mb_split) \
53-
PHP_FALIAS(mbereg_match, mb_ereg_match, arginfo_mb_ereg_match) \
54-
PHP_FALIAS(mbereg_search, mb_ereg_search, arginfo_mb_ereg_search) \
55-
PHP_FALIAS(mbereg_search_pos, mb_ereg_search_pos, arginfo_mb_ereg_search_pos) \
56-
PHP_FALIAS(mbereg_search_regs, mb_ereg_search_regs, arginfo_mb_ereg_search_regs) \
57-
PHP_FALIAS(mbereg_search_init, mb_ereg_search_init, arginfo_mb_ereg_search_init) \
58-
PHP_FALIAS(mbereg_search_getregs, mb_ereg_search_getregs, arginfo_mb_ereg_search_getregs) \
59-
PHP_FALIAS(mbereg_search_getpos, mb_ereg_search_getpos, arginfo_mb_ereg_search_getpos) \
60-
PHP_FALIAS(mbereg_search_setpos, mb_ereg_search_setpos, arginfo_mb_ereg_search_setpos)
47+
PHP_DEP_FALIAS(mbregex_encoding, mb_regex_encoding, arginfo_mb_regex_encoding) \
48+
PHP_DEP_FALIAS(mbereg, mb_ereg, arginfo_mb_ereg) \
49+
PHP_DEP_FALIAS(mberegi, mb_eregi, arginfo_mb_eregi) \
50+
PHP_DEP_FALIAS(mbereg_replace, mb_ereg_replace, arginfo_mb_ereg_replace) \
51+
PHP_DEP_FALIAS(mberegi_replace, mb_eregi_replace, arginfo_mb_eregi_replace) \
52+
PHP_DEP_FALIAS(mbsplit, mb_split, arginfo_mb_split) \
53+
PHP_DEP_FALIAS(mbereg_match, mb_ereg_match, arginfo_mb_ereg_match) \
54+
PHP_DEP_FALIAS(mbereg_search, mb_ereg_search, arginfo_mb_ereg_search) \
55+
PHP_DEP_FALIAS(mbereg_search_pos, mb_ereg_search_pos, arginfo_mb_ereg_search_pos) \
56+
PHP_DEP_FALIAS(mbereg_search_regs, mb_ereg_search_regs, arginfo_mb_ereg_search_regs) \
57+
PHP_DEP_FALIAS(mbereg_search_init, mb_ereg_search_init, arginfo_mb_ereg_search_init) \
58+
PHP_DEP_FALIAS(mbereg_search_getregs, mb_ereg_search_getregs, arginfo_mb_ereg_search_getregs) \
59+
PHP_DEP_FALIAS(mbereg_search_getpos, mb_ereg_search_getpos, arginfo_mb_ereg_search_getpos) \
60+
PHP_DEP_FALIAS(mbereg_search_setpos, mb_ereg_search_setpos, arginfo_mb_ereg_search_setpos)
6161
/* }}} */
6262

6363
#define PHP_MBREGEX_MAXCACHE 50

‎ext/mbstring/tests/bug72164.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ Bug #72164 (Null Pointer Dereference - mb_ereg_replace)
77
$var0 = "e";
88
$var2 = "";
99
$var3 = NULL;
10-
$var8 = mbereg_replace($var2,$var3,$var3,$var0);
10+
$var8 = mb_ereg_replace($var2,$var3,$var3,$var0);
1111
var_dump($var8);
1212
?>
1313
--EXPECTF--
14-
Deprecated: mbereg_replace(): The 'e' option is deprecated, use mb_ereg_replace_callback instead in %s%ebug72164.php on line %d
14+
Deprecated: mb_ereg_replace(): The 'e' option is deprecated, use mb_ereg_replace_callback instead in %s%ebug72164.php on line %d
1515
string(0) ""

‎ext/mbstring/tests/bug72399.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ Bug #72399 (Use-After-Free in MBString (search_re))
44
<?php require 'skipif.inc'; ?>
55
--FILE--
66
<?php
7-
$var5 = mbereg_search_init("","2");
7+
$var5 = mb_ereg_search_init("","2");
88
$var6 = mb_eregi_replace("2","","");
9-
$var13 = mbereg_search_pos();
9+
$var13 = mb_ereg_search_pos();
1010
?>
1111
--EXPECTF--
12-
Warning: mbereg_search_pos(): No regex given in %sbug72399.php on line %d
12+
Warning: mb_ereg_search_pos(): No regex given in %sbug72399.php on line %d

‎ext/mbstring/tests/bug72994.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ Bug #72994 (mbc_to_code() out of bounds read)
33
--SKIPIF--
44
<?php
55
if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
6-
if (!function_exists('mbereg_replace')) die('skip mbereg_replace() not available');
6+
if (!function_exists('mb_ereg_replace')) die('skip mb_ereg_replace() not available');
77
?>
88
--FILE--
99
<?php
10-
$var1 = mbereg_replace($var-232338951,NULL,NULL,NULL);
10+
$var1 = mb_ereg_replace($var-232338951,NULL,NULL,NULL);
1111
var_dump($var1);
1212
?>
1313
===DONE===
1414
--EXPECTF--
1515
Notice: Undefined variable: var in %s on line %d
1616

17-
Warning: mbereg_replace(): mbregex compile err: invalid code point value in %sbug72994.php on line %d
17+
Warning: mb_ereg_replace(): mbregex compile err: invalid code point value in %sbug72994.php on line %d
1818
bool(false)
1919
===DONE===

‎ext/mbstring/tests/mb_ereg2.phpt

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
11
--TEST--
22
mb_ereg() returning matches
33
--SKIPIF--
4-
<?php if (!function_exists("mb_ereg")) print "skip"; ?>
4+
<?php
5+
if (!extension_loaded('mbstring')) die('skip mbstring not enabled');
6+
if (!function_exists("mb_ereg")) print "skip mb_ereg() not available";
7+
?>
58
--FILE--
69
<?php
710

811
$a = -1; $b = -1; $c = -1;
9-
mbereg($a, $b, $c);
12+
mb_ereg($a, $b, $c);
1013
var_dump($a, $b, $c);
1114

12-
mberegi($a, $b, $c);
15+
mb_eregi($a, $b, $c);
1316
var_dump($a, $b, $c);
1417

15-
mbereg_search_init($a, $b, $c);
18+
mb_ereg_search_init($a, $b, $c);
1619
var_dump($a, $b, $c);
1720

1821
echo "Done\n";
@@ -31,7 +34,7 @@ array(1) {
3134
string(2) "-1"
3235
}
3336

34-
Warning: mbereg_search_init() expects parameter 3 to be string, array given in %s on line %d
37+
Warning: mb_ereg_search_init() expects parameter 3 to be string, array given in %s on line %d
3538
int(-1)
3639
int(-1)
3740
array(1) {

‎ext/mbstring/tests/mb_ereg3.phpt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ if (!function_exists("mb_ereg")) print "skip mb_ereg() not available";
88
--FILE--
99
<?php
1010

11+
// Note: This test is identical to mb_ereg2.phpt, but using deprecated mbereg_* aliases.
12+
// Deleted it once the deprecated aliases have been removed.
13+
1114
$a = -1; $b = -1; $c = -1;
1215
mbereg($a, $b, $c);
1316
var_dump($a, $b, $c);
@@ -21,19 +24,24 @@ var_dump($a, $b, $c);
2124
echo "Done\n";
2225
?>
2326
--EXPECTF--
27+
Deprecated: Function mbereg() is deprecated in %s on line %d
2428
int(-1)
2529
int(-1)
2630
array(1) {
2731
[0]=>
2832
string(2) "-1"
2933
}
34+
35+
Deprecated: Function mberegi() is deprecated in %s on line %d
3036
int(-1)
3137
int(-1)
3238
array(1) {
3339
[0]=>
3440
string(2) "-1"
3541
}
3642

43+
Deprecated: Function mbereg_search_init() is deprecated in %s on line %d
44+
3745
Warning: mbereg_search_init() expects parameter 3 to be string, array given in %s on line %d
3846
int(-1)
3947
int(-1)

0 commit comments

Comments
 (0)