6 files changed, 7 insertions, 41 deletions
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 212c8d013f..965c6be356 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -204,13 +204,6 @@ static const struct mb_overload_def mb_ovld[] = {
 	{MB_OVERLOAD_STRING, "strtolower", "mb_strtolower", "mb_orig_strtolower"},
 	{MB_OVERLOAD_STRING, "strtoupper", "mb_strtoupper", "mb_orig_strtoupper"},
 	{MB_OVERLOAD_STRING, "substr_count", "mb_substr_count", "mb_orig_substr_count"},
-#if HAVE_MBREGEX
-	{MB_OVERLOAD_REGEX, "ereg", "mb_ereg", "mb_orig_ereg"},
-	{MB_OVERLOAD_REGEX, "eregi", "mb_eregi", "mb_orig_eregi"},
-	{MB_OVERLOAD_REGEX, "ereg_replace", "mb_ereg_replace", "mb_orig_ereg_replace"},
-	{MB_OVERLOAD_REGEX, "eregi_replace", "mb_eregi_replace", "mb_orig_eregi_replace"},
-	{MB_OVERLOAD_REGEX, "split", "mb_split", "mb_orig_split"},
-#endif
 	{0, NULL, NULL, NULL}
 }; 
 /* }}} */
diff --git a/ext/mbstring/tests/mb_split.phpt b/ext/mbstring/tests/mb_split.phpt
index c10b0d7b80..1031cd26d7 100644
--- a/ext/mbstring/tests/mb_split.phpt
+++ b/ext/mbstring/tests/mb_split.phpt
@@ -3,6 +3,7 @@ mb_split()
 --SKIPIF--
 <?php
 extension_loaded('mbstring') or die('skip mbstring not available');
+extension_loaded('pcre') or die('skip pcre not available');
 function_exists('mb_split') or die("skip mb_split() is not available in this build");
 ?>
 --INI--
@@ -15,7 +16,7 @@ mbstring.func_overload=0
 	function verify_split( $spliton, $str, $count = 0 )
 	{
 		$result1 = mb_split( $spliton, $str, $count );
-		$result2 = split( $spliton, $str, $count );
+		$result2 = preg_split( "/$spliton/", $str, $count );
 		if ( $result1 == $result2 ) {
 			print "ok\n";
 		} else {
@@ -26,7 +27,7 @@ mbstring.func_overload=0
 	var_dump( mb_split( b" ", b"a b c d e f g" )
 	          == mb_split( b"[[:space:]]", b"a\nb\tc\nd e f g" ) );
 
-	for ( $i = 0; $i < 5; ++$i ) {
+	for ( $i = 1; $i < 5; ++$i ) {
 		verify_split( b" ", b"a\tb\tc\td   e\tf g", $i );
 	}
 
@@ -37,31 +38,12 @@ mbstring.func_overload=0
 
 --EXPECTF--
 bool(true)
-
-Deprecated: Function split() is deprecated in %s on line %d
 ok
-
-Deprecated: Function split() is deprecated in %s on line %d
 ok
-
-Deprecated: Function split() is deprecated in %s on line %d
 ok
-
-Deprecated: Function split() is deprecated in %s on line %d
 ok
-
-Deprecated: Function split() is deprecated in %s on line %d
 ok
-
-Deprecated: Function split() is deprecated in %s on line %d
-ok
-
-Deprecated: Function split() is deprecated in %s on line %d
 2-2
-
-Deprecated: Function split() is deprecated in %s on line %d
 3-3
-
-Deprecated: Function split() is deprecated in %s on line %d
 4-4
 
diff --git a/ext/mbstring/tests/overload02.phpt b/ext/mbstring/tests/overload02.phpt
index 9b5cecdc40..ad007cc066 100644
--- a/ext/mbstring/tests/overload02.phpt
+++ b/ext/mbstring/tests/overload02.phpt
@@ -24,7 +24,7 @@ $converted_str = mb_convert_encoding($str, 'Shift_JIS');
 mb_regex_encoding('Shift_JIS');
 foreach($ngchars as $c) {
 	$c = mb_convert_encoding($c, 'Shift_JIS');
-	$replaced = mb_convert_encoding(ereg_replace($c, '!!', $converted_str), mb_internal_encoding(), 'Shift_JIS');
+	$replaced = mb_convert_encoding(str_replace($c, '!!', $converted_str), mb_internal_encoding(), 'Shift_JIS');
 	var_dump(strpos($replaced, '!!'));
 }
 ?>
diff --git a/ext/mbstring/tests/php_gr_jp_10830.phpt b/ext/mbstring/tests/php_gr_jp_10830.phpt
index 1cbfc2ae1f..f9599d995f 100644
--- a/ext/mbstring/tests/php_gr_jp_10830.phpt
+++ b/ext/mbstring/tests/php_gr_jp_10830.phpt
@@ -10,11 +10,9 @@ function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build
 $a="aaa\n<>";
 
 var_dump( mb_ereg("^[^><]+$",$a) );
-var_dump( ereg("^[^><]+$",$a) );
+var_dump( !!preg_match("/^[^><]+$/",$a) );
 ?>
 
 --EXPECTF--
 bool(false)
-
-Deprecated: Function ereg() is deprecated in %s on line %d
 bool(false)
diff --git a/ext/mbstring/tests/php_gr_jp_dev_884-1.phpt b/ext/mbstring/tests/php_gr_jp_dev_884-1.phpt
index 64fc054aab..4978d0ce57 100644
--- a/ext/mbstring/tests/php_gr_jp_dev_884-1.phpt
+++ b/ext/mbstring/tests/php_gr_jp_dev_884-1.phpt
@@ -8,12 +8,9 @@ function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not availab
 --FILE--
 <?php
 set_time_limit(2);
-var_dump(ereg_replace(".*", "b", "a"));
 var_dump(preg_replace("/.*/", "b", "a"));
 var_dump(mb_ereg_replace(".*", "b", "a"));
 ?>
 --EXPECTF--
-Deprecated: Function ereg_replace() is deprecated in %s on line %d
-string(2) "bb"
 string(2) "bb"
 string(2) "bb"
diff --git a/ext/mbstring/tests/php_gr_jp_dev_884-2.phpt b/ext/mbstring/tests/php_gr_jp_dev_884-2.phpt
index 937b2171b5..2f74dff64b 100644
--- a/ext/mbstring/tests/php_gr_jp_dev_884-2.phpt
+++ b/ext/mbstring/tests/php_gr_jp_dev_884-2.phpt
@@ -8,16 +8,12 @@ function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not availab
 --FILE--
 <?php
 var_dump(mb_ereg_replace("C?$", "Z", "ABC"));
-var_dump(ereg_replace("C?$", "Z", "ABC"));
+var_dump(preg_replace("/C?$/", "Z", "ABC"));
 var_dump(mb_ereg_replace("C*$", "Z", "ABC"));
-var_dump(ereg_replace("C*$", "Z", "ABC"));
+var_dump(preg_replace("/C*$/", "Z", "ABC"));
 ?>
 --EXPECTF--
 string(4) "ABZZ"
-
-Deprecated: Function ereg_replace() is deprecated in %s on line %d
 string(4) "ABZZ"
 string(4) "ABZZ"
-
-Deprecated: Function ereg_replace() is deprecated in %s on line %d
 string(4) "ABZZ"