From 788bd21a9184c43451fdcd26a467de378b9f2ad3 Mon Sep 17 00:00:00 2001
From: Smotrov Dmitriy <dsxack@gmail.com>
Date: Mon, 8 Feb 2016 11:33:14 +0300
Subject: [PATCH] Fix 65785

---
 ext/mbstring/mbstring.c             |  4 ++++
 ext/mbstring/tests/bug52931.phpt    |  1 +
 ext/mbstring/tests/bug65785.phpt    | 10 ++++++++++
 ext/mbstring/tests/mb_get_info.phpt |  1 +
 ext/mbstring/tests/overload01.phpt  |  1 +
 ext/mbstring/tests/overload02.phpt  |  1 +
 6 files changed, 18 insertions(+)
 create mode 100644 ext/mbstring/tests/bug65785.phpt

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index b5812cb402f0b..9b1fbda4d1a7f 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -1621,6 +1621,10 @@ PHP_RINIT_FUNCTION(mbstring)
 	if (MBSTRG(func_overload)){
 		p = &(mb_ovld[0]);
 
+		if (p > 0) {
+			php_error_docref("ref.mbstring", E_DEPRECATED, "Use of mbstring.func_overload is deprecated");
+		}
+
 		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 52efd03de23aa..842c2b9db6430 100644
--- a/ext/mbstring/tests/bug52931.phpt
+++ b/ext/mbstring/tests/bug52931.phpt
@@ -3,6 +3,7 @@ Bug #52931 (strripos not overloaded with function overloading enabled)
 --SKIPIF--
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --INI--
+error_reporting=E_ALL ^ E_DEPRECATED
 mbstring.func_overload = 7
 mbstring.internal_encoding = utf-8
 --FILE--
diff --git a/ext/mbstring/tests/bug65785.phpt b/ext/mbstring/tests/bug65785.phpt
new file mode 100644
index 0000000000000..72e46049e7292
--- /dev/null
+++ b/ext/mbstring/tests/bug65785.phpt
@@ -0,0 +1,10 @@
+--TEST--
+Bug #65785 (mbstring.func_overload should be depreciated)
+--INI--
+mbstring.func_overload=2
+--FILE--
+<?php
+echo ini_get('mbstring.func_overload');?>
+--EXPECTF--
+Deprecated: Unknown: Use of mbstring.func_overload is deprecated in Unknown on line 0
+2
diff --git a/ext/mbstring/tests/mb_get_info.phpt b/ext/mbstring/tests/mb_get_info.phpt
index a3739e162355c..7d405ace69360 100644
--- a/ext/mbstring/tests/mb_get_info.phpt
+++ b/ext/mbstring/tests/mb_get_info.phpt
@@ -3,6 +3,7 @@ Test mb_get_info() function
 --SKIPIF--
 <?php extension_loaded('mbstring') or die('skip'); ?>
 --INI--
+error_reporting=E_ALL ^ E_DEPRECATED
 mbstring.encoding_translation=1
 mbstring.language=Korean
 mbstring.internal_encoding=UTF-8
diff --git a/ext/mbstring/tests/overload01.phpt b/ext/mbstring/tests/overload01.phpt
index b0990e8161a83..3c4952d4f11a6 100644
--- a/ext/mbstring/tests/overload01.phpt
+++ b/ext/mbstring/tests/overload01.phpt
@@ -8,6 +8,7 @@ Function overloading test 1
 	}
 ?>
 --INI--
+error_reporting=E_ALL ^ E_DEPRECATED
 output_handler=
 mbstring.func_overload=7
 mbstring.internal_encoding=EUC-JP
diff --git a/ext/mbstring/tests/overload02.phpt b/ext/mbstring/tests/overload02.phpt
index ad007cc066580..fa7613676e440 100644
--- a/ext/mbstring/tests/overload02.phpt
+++ b/ext/mbstring/tests/overload02.phpt
@@ -11,6 +11,7 @@ Function overloading test 2
 	}
 ?>
 --INI--
+error_reporting=E_ALL ^ E_DEPRECATED
 output_handler=
 mbstring.func_overload=7
 mbstring.internal_encoding=EUC-JP