Skip to content

Commit daec4c4

Browse files
committed
ext/mbstring: Remove ZPP tests
1 parent d4c970f commit daec4c4

File tree

5 files changed

+29
-311
lines changed

5 files changed

+29
-311
lines changed

ext/mbstring/tests/bug43994.phpt

Lines changed: 14 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -14,55 +14,24 @@ function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build
1414
* pattern is supplied to mb_ereg. Similar error message to ereg().
1515
*/
1616

17-
$inputs = array(false, FALSE, "", '');
17+
$input = '';
18+
echo "Without \$regs arg:\n";
19+
try {
20+
var_dump( mb_ereg($input, 'hello, world') );
21+
} catch (\ValueError $e) {
22+
echo $e->getMessage() . \PHP_EOL;
23+
}
1824

19-
$iterator = 1;
20-
foreach($inputs as $input) {
21-
if(@is_array($mb_regs)){
22-
$mb_regs = '';
23-
}
24-
echo "\n-- Iteration $iterator --\n";
25-
echo "Without \$regs arg:\n";
26-
try {
27-
var_dump( mb_ereg($input, 'hello, world') );
28-
} catch (\ValueError $e) {
29-
echo $e->getMessage() . \PHP_EOL;
30-
}
25+
echo "With \$regs arg:\n";
26+
try {
27+
var_dump(mb_ereg($input, 'hello, world', $mb_regs));
28+
} catch (\ValueError $e) {
29+
echo $e->getMessage() . \PHP_EOL;
30+
}
3131

32-
echo "With \$regs arg:\n";
33-
try {
34-
var_dump(mb_ereg($input, 'hello, world', $mb_regs));
35-
} catch (\ValueError $e) {
36-
echo $e->getMessage() . \PHP_EOL;
37-
}
38-
39-
var_dump($mb_regs);
40-
$iterator++;
41-
};
32+
var_dump($mb_regs);
4233
?>
4334
--EXPECT--
44-
-- Iteration 1 --
45-
Without $regs arg:
46-
mb_ereg(): Argument #1 ($pattern) must not be empty
47-
With $regs arg:
48-
mb_ereg(): Argument #1 ($pattern) must not be empty
49-
NULL
50-
51-
-- Iteration 2 --
52-
Without $regs arg:
53-
mb_ereg(): Argument #1 ($pattern) must not be empty
54-
With $regs arg:
55-
mb_ereg(): Argument #1 ($pattern) must not be empty
56-
NULL
57-
58-
-- Iteration 3 --
59-
Without $regs arg:
60-
mb_ereg(): Argument #1 ($pattern) must not be empty
61-
With $regs arg:
62-
mb_ereg(): Argument #1 ($pattern) must not be empty
63-
NULL
64-
65-
-- Iteration 4 --
6635
Without $regs arg:
6736
mb_ereg(): Argument #1 ($pattern) must not be empty
6837
With $regs arg:

ext/mbstring/tests/bug43998.phpt

Lines changed: 10 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -11,41 +11,19 @@ mbstring
1111

1212
$sourcestring = 'Hello, World';
1313

14-
$inputs = array(12345, 12.3456789000E-10, true, false, "");
15-
$iterator = 1;
16-
foreach($inputs as $input) {
17-
echo "\n-- Iteration $iterator --\n";
18-
try {
19-
var_dump( mb_strtolower($sourcestring, $input) );
20-
} catch (\ValueError $e) {
21-
echo $e->getMessage() . \PHP_EOL;
22-
}
23-
try {
24-
var_dump( mb_strtoupper($sourcestring, $input) );
25-
} catch (\ValueError $e) {
26-
echo $e->getMessage() . \PHP_EOL;
27-
}
28-
$iterator++;
14+
$input = "";
15+
try {
16+
var_dump( mb_strtolower($sourcestring, $input) );
17+
} catch (\ValueError $e) {
18+
echo $e->getMessage() . \PHP_EOL;
19+
}
20+
try {
21+
var_dump( mb_strtoupper($sourcestring, $input) );
22+
} catch (\ValueError $e) {
23+
echo $e->getMessage() . \PHP_EOL;
2924
}
3025

3126
?>
3227
--EXPECT--
33-
-- Iteration 1 --
34-
mb_strtolower(): Argument #2 ($encoding) must be a valid encoding, "12345" given
35-
mb_strtoupper(): Argument #2 ($encoding) must be a valid encoding, "12345" given
36-
37-
-- Iteration 2 --
38-
mb_strtolower(): Argument #2 ($encoding) must be a valid encoding, "1.23456789E-9" given
39-
mb_strtoupper(): Argument #2 ($encoding) must be a valid encoding, "1.23456789E-9" given
40-
41-
-- Iteration 3 --
42-
mb_strtolower(): Argument #2 ($encoding) must be a valid encoding, "1" given
43-
mb_strtoupper(): Argument #2 ($encoding) must be a valid encoding, "1" given
44-
45-
-- Iteration 4 --
46-
mb_strtolower(): Argument #2 ($encoding) must be a valid encoding, "" given
47-
mb_strtoupper(): Argument #2 ($encoding) must be a valid encoding, "" given
48-
49-
-- Iteration 5 --
5028
mb_strtolower(): Argument #2 ($encoding) must be a valid encoding, "" given
5129
mb_strtoupper(): Argument #2 ($encoding) must be a valid encoding, "" given

ext/mbstring/tests/gh16229.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ if (!function_exists("mb_send_mail") || !mb_language("japanese")) {
1414
--FILE--
1515
<?php
1616
try {
17-
$a = false;
17+
$a = '';
1818
mb_send_mail($a,$a,$a,$a,$a);
1919
} catch (Exception $e) {
2020
}
Lines changed: 4 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
--TEST--
2-
Test mb_ereg_replace() function : usage variations - <type here specifics of this variation>
3-
--INI--
4-
error_reporting=E_ALL & ~E_NOTICE
2+
Test mb_ereg_replace() function : usage variations - different input types
53
--EXTENSIONS--
64
mbstring
75
--SKIPIF--
@@ -17,22 +15,8 @@ $replacement = 'string_val';
1715
$string = 'string_val';
1816
$option = '';
1917

20-
// get a class
21-
class classA
22-
{
23-
public function __toString() {
24-
return "UTF-8";
25-
}
26-
}
27-
28-
// heredoc string
29-
$heredoc = <<<EOT
30-
UTF-8
31-
EOT;
32-
3318
// unexpected values to be passed to $encoding argument
34-
$inputs = array(
35-
19+
$inputs = [
3620
// int data
3721
/*1*/ 0,
3822
1,
@@ -45,26 +29,9 @@ $inputs = array(
4529
12.3456789000e10,
4630
12.3456789000E-10,
4731
.5,
48-
49-
// boolean data
50-
/*12*/ true,
51-
false,
52-
TRUE,
53-
FALSE,
54-
55-
// empty data
56-
/*16*/ "",
5732
'',
58-
59-
// string data
60-
/*18*/ "UTF-8",
6133
'UTF-8',
62-
$heredoc,
63-
64-
// object data
65-
/*21*/ new classA(),
66-
67-
);
34+
];
6835

6936
// loop through each element of the array for pattern
7037

@@ -108,32 +75,8 @@ string(10) "string_val"
10875
string(10) "string_val"
10976

11077
-- Iteration 10 --
111-
string(10) "string_val"
112-
113-
-- Iteration 11 --
114-
string(120) "string_valsstring_valtstring_valrstring_valistring_valnstring_valgstring_val_string_valvstring_valastring_vallstring_val"
115-
116-
-- Iteration 12 --
117-
string(10) "string_val"
118-
119-
-- Iteration 13 --
120-
string(120) "string_valsstring_valtstring_valrstring_valistring_valnstring_valgstring_val_string_valvstring_valastring_vallstring_val"
121-
122-
-- Iteration 14 --
12378
string(120) "string_valsstring_valtstring_valrstring_valistring_valnstring_valgstring_val_string_valvstring_valastring_vallstring_val"
12479

125-
-- Iteration 15 --
126-
string(120) "string_valsstring_valtstring_valrstring_valistring_valnstring_valgstring_val_string_valvstring_valastring_vallstring_val"
127-
128-
-- Iteration 16 --
129-
string(10) "string_val"
130-
131-
-- Iteration 17 --
132-
string(10) "string_val"
133-
134-
-- Iteration 18 --
135-
string(10) "string_val"
136-
137-
-- Iteration 19 --
80+
-- Iteration 11 --
13881
string(10) "string_val"
13982
Done

ext/mbstring/tests/mb_substitute_character_variation_weak_types.phpt

Lines changed: 0 additions & 172 deletions
This file was deleted.

0 commit comments

Comments
 (0)