From: Nikita Popov <nikita.ppv@gmail.com>
Date: Thu, 2 Feb 2017 20:20:37 +0000 (+0100)
Subject: Deprecate mbstring.func_overload
X-Git-Tag: php-7.2.0alpha1~405
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a8239ff23272a346f6cb8f01bff384f94a3bcb79;p=php

Deprecate mbstring.func_overload
---

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 80393d8b35..82d3736e23 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 52efd03de2..72debf7d05 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 a3739e1623..5b9c0c0aef 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 b0990e8161..7efc65da82 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 ad007cc066..48705b782b 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 2d3233f6bf..b82615ac4a 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)