Fix missing Deprecated tests

Author: youkidearitai

ext/mbstring/tests/mb_ereg_search_named_subpatterns_1.phpt

@@ -8,7 +8,9 @@ function_exists('mb_ereg_search') or die("skip mb_ereg_search() is not available
 set_error_handler(function($errno, $errstr, $errfile, $errline) {
 	switch ($errno) {
 	case E_DEPRECATED:
-		die("skip deprecated oniguruma");
+		if (str_contains($errfile, "skip.php")) {
+			die("skip deprecated oniguruma");
+		}
 	}
 });
 version_compare(MB_ONIGURUMA_VERSION, '6.9.4', '<') or die("skip requires oniguruma < 6.9.4");

ext/mbstring/tests/mb_ereg_search_named_subpatterns_2.phpt

@@ -8,7 +8,9 @@ function_exists('mb_ereg_search') or die("skip mb_ereg_search() is not available
 set_error_handler(function($errno, $errstr, $errfile, $errline) {
 	switch ($errno) {
 	case E_DEPRECATED:
-		die("skip deprecated oniguruma");
+		if (str_contains($errfile, "skip.php")) {
+			die("skip deprecated oniguruma");
+		}
 	}
 });
 version_compare(MB_ONIGURUMA_VERSION, '6.9.4', '>=') or die("skip requires oniguruma >= 6.9.4");

ext/mbstring/tests/mb_ereg_variation3.phpt

@@ -8,7 +8,9 @@ function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build
 set_error_handler(function($errno, $errstr, $errfile, $errline) {
 	switch ($errno) {
 	case E_DEPRECATED:
-		die("skip deprecated oniguruma");
+		if (str_contains($errfile, "skip.php")) {
+			die("skip deprecated oniguruma");
+		}
 	}
 });
 version_compare(MB_ONIGURUMA_VERSION, '6.1.0', '>=') or die("skip requires oniguruma >= 6.1.0");

ext/mbstring/tests/mbregex_stack_limit.phpt

@@ -8,7 +8,9 @@ if (!function_exists('mb_ereg')) die('skip mb_ereg not available');
 set_error_handler(function($errno, $errstr, $errfile, $errline) {
 	switch ($errno) {
 	case E_DEPRECATED:
-		die("skip deprecated oniguruma");
+		if (str_contains($errfile, "skip.php")) {
+			die("skip deprecated oniguruma");
+		}
 	}
 });
 if (version_compare(MB_ONIGURUMA_VERSION, '6.9.3') < 0) {
@@ -30,8 +32,13 @@ var_dump(mb_ereg('\\s+$', $s));
 
 echo 'OK';
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function mb_ereg() is deprecated since 8.6, because the underlying library is no longer maintained in %s on line %d
 bool(false)
+
+Deprecated: Function mb_ereg() is deprecated since 8.6, because the underlying library is no longer maintained in %s on line %d
 bool(false)
+
+Deprecated: Function mb_ereg() is deprecated since 8.6, because the underlying library is no longer maintained in %s on line %d
 bool(true)
 OK

ext/mbstring/tests/mbregex_stack_limit2.phpt

@@ -9,7 +9,9 @@ if (!function_exists('mb_ereg_replace')) die('skip mb_ereg_replace not available
 set_error_handler(function($errno, $errstr, $errfile, $errline) {
 	switch ($errno) {
 	case E_DEPRECATED:
-		die("skip deprecated oniguruma");
+		if (str_contains($errfile, "skip.php")) {
+			die("skip deprecated oniguruma");
+		}
 	}
 });
 if (version_compare(MB_ONIGURUMA_VERSION, '6.9.3') < 0) {
@@ -34,6 +36,10 @@ var_dump(mb_trim_regex(str_repeat(' ', 10000)));
 echo 'OK';
 ?>
 --EXPECTF--
+Deprecated: Function mb_ereg_replace() is deprecated since 8.6, because the underlying library is no longer maintained in %s on line %d
+
 Warning: mb_ereg_replace(): mbregex search failure in php_mbereg_replace_exec(): match-stack limit over in %s on line %d
+
+Deprecated: Function mb_ereg_replace() is deprecated since 8.6, because the underlying library is no longer maintained in %s on line %d
 string(0) ""
 OK

ext/mbstring/tests/retry_limit.phpt

@@ -8,7 +8,9 @@ if (!function_exists('mb_ereg')) die('skip mb_ereg not available');
 set_error_handler(function($errno, $errstr, $errfile, $errline) {
 	switch ($errno) {
 	case E_DEPRECATED:
-		die("skip deprecated oniguruma");
+		if (str_contains($errfile, "skip.php")) {
+			die("skip deprecated oniguruma");
+		}
 	}
 });
 if (version_compare(MB_ONIGURUMA_VERSION, '6.9.3') < 0) {