Skip to content

Commit 8bcbc0d

Browse files
committed
Fix from feedback
1 parent 45232f3 commit 8bcbc0d

5 files changed

Lines changed: 5 additions & 45 deletions

File tree

ext/mbstring/tests/mb_ereg_search_named_subpatterns_1.phpt

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,7 @@ mbstring
55
--SKIPIF--
66
<?php
77
function_exists('mb_ereg_search') or die("skip mb_ereg_search() is not available in this build");
8-
set_error_handler(function($errno, $errstr, $errfile, $errline) {
9-
switch ($errno) {
10-
case E_DEPRECATED:
11-
if (str_contains($errfile, "skip.php")) {
12-
return;
13-
}
14-
}
15-
});
16-
version_compare(MB_ONIGURUMA_VERSION, '6.9.4', '<') or die("skip requires oniguruma < 6.9.4");
8+
@version_compare(MB_ONIGURUMA_VERSION, '6.9.4', '<') or die("skip requires oniguruma < 6.9.4");
179
?>
1810
--FILE--
1911
<?php

ext/mbstring/tests/mb_ereg_variation3.phpt

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,7 @@ mbstring
55
--SKIPIF--
66
<?php
77
function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build");
8-
set_error_handler(function($errno, $errstr, $errfile, $errline) {
9-
switch ($errno) {
10-
case E_DEPRECATED:
11-
if (str_contains($errfile, "skip.php")) {
12-
return;
13-
}
14-
}
15-
});
16-
version_compare(MB_ONIGURUMA_VERSION, '6.1.0', '>=') or die("skip requires oniguruma >= 6.1.0");
8+
@version_compare(MB_ONIGURUMA_VERSION, '6.1.0', '>=') or die("skip requires oniguruma >= 6.1.0");
179
?>
1810
--FILE--
1911
<?php

ext/mbstring/tests/mbregex_stack_limit.phpt

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,7 @@ mbstring
55
--SKIPIF--
66
<?php
77
if (!function_exists('mb_ereg')) die('skip mb_ereg not available');
8-
set_error_handler(function($errno, $errstr, $errfile, $errline) {
9-
switch ($errno) {
10-
case E_DEPRECATED:
11-
if (str_contains($errfile, "skip.php")) {
12-
return;
13-
}
14-
}
15-
});
16-
if (version_compare(MB_ONIGURUMA_VERSION, '6.9.3') < 0) {
8+
if (@version_compare(MB_ONIGURUMA_VERSION, '6.9.3') < 0) {
179
die('skip requires Oniguruma 6.9.3');
1810
}
1911
?>

ext/mbstring/tests/mbregex_stack_limit2.phpt

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,7 @@ iconv
66
--SKIPIF--
77
<?php
88
if (!function_exists('mb_ereg_replace')) die('skip mb_ereg_replace not available');
9-
set_error_handler(function($errno, $errstr, $errfile, $errline) {
10-
switch ($errno) {
11-
case E_DEPRECATED:
12-
if (str_contains($errfile, "skip.php")) {
13-
return;
14-
}
15-
}
16-
});
17-
if (version_compare(MB_ONIGURUMA_VERSION, '6.9.3') < 0) {
9+
if (@version_compare(MB_ONIGURUMA_VERSION, '6.9.3') < 0) {
1810
die('skip requires Oniguruma 6.9.3');
1911
}
2012
?>

ext/mbstring/tests/retry_limit.phpt

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,7 @@ mbstring
55
--SKIPIF--
66
<?php
77
if (!function_exists('mb_ereg')) die('skip mb_ereg not available');
8-
set_error_handler(function($errno, $errstr, $errfile, $errline) {
9-
switch ($errno) {
10-
case E_DEPRECATED:
11-
if (str_contains($errfile, "skip.php")) {
12-
return;
13-
}
14-
}
15-
});
16-
if (version_compare(MB_ONIGURUMA_VERSION, '6.9.3') < 0) {
8+
if (@version_compare(MB_ONIGURUMA_VERSION, '6.9.3') < 0) {
179
die('skip requires Oniguruma >= 6.9.3');
1810
}
1911
?>

0 commit comments

Comments
 (0)