com php-src: Deprecate mbstring.func_overload: ext/mbst ring/mbstring.c ext/mbstring/tests/bug52931.php t ext/mbstring/tests/mb_get_info.phpt ext/mbstring/te sts/overload01.phpt ext/mbstring/tests/overload02 .phpt ext/opcache/tests/bug68644.phpt

Commit:    a8239ff23272a346f6cb8f01bff384f94a3bcb79
Author:    Nikita Popov <[email protected]>         Thu, 2 Feb 2017 21:20:37 +0100
Parents:   c61daf415d0207abda6041a3ed12c23b6a9d8ebf
Branches:  master

Link:       http://git.php.net/?p=php-src.git;a=commitdiff;h=a8239ff23272a346f6cb8f01bff384f94a3bcb79

Log:
Deprecate mbstring.func_overload

Changed paths:
  M  ext/mbstring/mbstring.c
  M  ext/mbstring/tests/bug52931.phpt
  M  ext/mbstring/tests/mb_get_info.phpt
  M  ext/mbstring/tests/overload01.phpt
  M  ext/mbstring/tests/overload02.phpt
  M  ext/opcache/tests/bug68644.phpt


Diff:
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 80393d8..82d3736 100644
--- 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 52efd03..72debf7 100644
--- 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 a3739e1..5b9c0c0 100644
--- 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 b0990e8..7efc65d 100644
--- 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 ad007cc..48705b7 100644
--- 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 2d3233f..b82615a 100644
--- 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)