Deprecate mbstring.func_overload

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 80393d8b35d3ec07cf635811b63d70c027763ce5..82d3736e23328df66950e6df57a14e002d01cc6e 100644 (file)
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -1644,8 +1644,9 @@ PHP_RINIT_FUNCTION(mbstring)
 
        /* override original function. */
        if (MBSTRG(func_overload)){
-               p = &(mb_ovld[0]);
+               zend_error(E_DEPRECATED, "The mbstring.func_overload directive is deprecated");
 
+               p = &(mb_ovld[0]);
                CG(compiler_options) |= ZEND_COMPILE_NO_BUILTIN_STRLEN;
                while (p->type > 0) {
                        if ((MBSTRG(func_overload) & p->type) == p->type &&

diff --git a/ext/mbstring/tests/bug52931.phpt b/ext/mbstring/tests/bug52931.phpt
index 52efd03de23aae5f9106eb3267acbf4e0bbdb61f..72debf7d05ee6288646656dcdf448566d9e4b8ad 100644 (file)
--- a/ext/mbstring/tests/bug52931.phpt
+++ b/ext/mbstring/tests/bug52931.phpt
@@ -18,6 +18,7 @@ var_dump(mb_strripos($string, '</body>'));
 
 ?>
 --EXPECTF--
+Deprecated: The mbstring.func_overload directive is deprecated in Unknown on line 0
 int(27)
 int(27)
 int(20)

diff --git a/ext/mbstring/tests/mb_get_info.phpt b/ext/mbstring/tests/mb_get_info.phpt
index a3739e162355cb94c7fd4015d662a347dc1ebce8..5b9c0c0aef185893e65ea95ac514ef2190865f2f 100644 (file)
--- a/ext/mbstring/tests/mb_get_info.phpt
+++ b/ext/mbstring/tests/mb_get_info.phpt
@@ -24,6 +24,7 @@ foreach (array_keys($result) as $key) {
 }
 ?>
 --EXPECT--
+Deprecated: The mbstring.func_overload directive is deprecated in Unknown on line 0
 array(15) {
   ["internal_encoding"]=>
   string(5) "UTF-8"

diff --git a/ext/mbstring/tests/overload01.phpt b/ext/mbstring/tests/overload01.phpt
index b0990e8161a831311ea9793af43033142a4c5957..7efc65da8261cb575fc7ffcb7f7109eb151e34dc 100644 (file)
--- a/ext/mbstring/tests/overload01.phpt
+++ b/ext/mbstring/tests/overload01.phpt
@@ -20,6 +20,7 @@ $str = '
 var_dump(strlen($str));
 var_dump(mb_strlen($str));
 --EXPECT--
+Deprecated: The mbstring.func_overload directive is deprecated in Unknown on line 0
 EUC-JP
 int(33)
 int(33)

diff --git a/ext/mbstring/tests/overload02.phpt b/ext/mbstring/tests/overload02.phpt
index ad007cc066580cd74f8f22aca23dffaabda38b1a..48705b782b2885da73bd5fcfe2a235821d1c9650 100644 (file)
--- a/ext/mbstring/tests/overload02.phpt
+++ b/ext/mbstring/tests/overload02.phpt
@@ -29,6 +29,7 @@ foreach($ngchars as $c) {
 }
 ?>
 --EXPECT--
+Deprecated: The mbstring.func_overload directive is deprecated in Unknown on line 0
 EUC-JP
 int(10)
 int(8)

diff --git a/ext/opcache/tests/bug68644.phpt b/ext/opcache/tests/bug68644.phpt
index 2d3233f6bf7ca642ee915e82549e37f0e1138f2c..b82615ac4abb8ec8844bdf4657fde46a00da2218 100644 (file)
--- a/ext/opcache/tests/bug68644.phpt
+++ b/ext/opcache/tests/bug68644.phpt
@@ -13,5 +13,6 @@ var_dump(strlen("中国, 北京"));
 var_dump(mb_strlen("中国, 北京"));
 ?>
 --EXPECT--
+Deprecated: The mbstring.func_overload directive is deprecated in Unknown on line 0
 int(6)
 int(6)