Skip to content

Commit f978c5a

Browse files
NickSdotNickSdot
authored
ext/standard: applied fixers to improve test robustness (#23136)
1 parent c2f686a commit f978c5a

451 files changed

Lines changed: 3418 additions & 3434 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ext/standard/tests/array/GHSA-h96m-rvf9-jgm2.phpt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ $power = 20; // Chosen to be well within a memory_limit
77
$arr = range(0, 2**$power);
88
try {
99
array_merge(...array_fill(0, 2**(32-$power), $arr));
10-
} catch (Error $e) {
11-
echo $e->getMessage(), "\n";
10+
} catch (Throwable $e) {
11+
echo $e::class, ': ', $e->getMessage(), "\n";
1212
}
1313

1414
?>
1515
--EXPECTF--
16-
The total number of elements must be lower than %d
16+
Error: The total number of elements must be lower than %d

‎ext/standard/tests/array/array_chunk2.phpt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ $input_array = array('a', 'b', 'c', 'd', 'e');
66

77
try {
88
var_dump(array_chunk($input_array, 0));
9-
} catch (\ValueError $e) {
10-
echo $e->getMessage() . "\n";
9+
} catch (Throwable $e) {
10+
echo $e::class, ': ', $e->getMessage(), "\n";
1111
}
1212

1313
try {
1414
var_dump(array_chunk($input_array, 0, true));
15-
} catch (\ValueError $e) {
16-
echo $e->getMessage() . "\n";
15+
} catch (Throwable $e) {
16+
echo $e::class, ': ', $e->getMessage(), "\n";
1717
}
1818

1919
var_dump(array_chunk($input_array, 1));
@@ -24,8 +24,8 @@ var_dump(array_chunk($input_array, 10));
2424
var_dump(array_chunk($input_array, 10, true));
2525
?>
2626
--EXPECT--
27-
array_chunk(): Argument #2 ($length) must be greater than 0
28-
array_chunk(): Argument #2 ($length) must be greater than 0
27+
ValueError: array_chunk(): Argument #2 ($length) must be greater than 0
28+
ValueError: array_chunk(): Argument #2 ($length) must be greater than 0
2929
array(5) {
3030
[0]=>
3131
array(1) {

‎ext/standard/tests/array/array_chunk_variation5.phpt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,28 +23,28 @@ foreach ($sizes as $size){
2323
echo "\n-- Testing array_chunk() when size = $size --\n";
2424
try {
2525
var_dump( array_chunk($input_array, $size) );
26-
} catch (\ValueError $e) {
27-
echo $e->getMessage() . "\n";
26+
} catch (Throwable $e) {
27+
echo $e::class, ': ', $e->getMessage(), "\n";
2828
}
2929
try {
3030
var_dump( array_chunk($input_array, $size, true) );
31-
} catch (\ValueError $e) {
32-
echo $e->getMessage() . "\n";
31+
} catch (Throwable $e) {
32+
echo $e::class, ': ', $e->getMessage(), "\n";
3333
}
3434
try {
3535
var_dump( array_chunk($input_array, $size, false) );
36-
} catch (\ValueError $e) {
37-
echo $e->getMessage() . "\n";
36+
} catch (Throwable $e) {
37+
echo $e::class, ': ', $e->getMessage(), "\n";
3838
}
3939
}
4040
?>
4141
--EXPECT--
4242
*** Testing array_chunk() : usage variations ***
4343

4444
-- Testing array_chunk() when size = -1 --
45-
array_chunk(): Argument #2 ($length) must be greater than 0
46-
array_chunk(): Argument #2 ($length) must be greater than 0
47-
array_chunk(): Argument #2 ($length) must be greater than 0
45+
ValueError: array_chunk(): Argument #2 ($length) must be greater than 0
46+
ValueError: array_chunk(): Argument #2 ($length) must be greater than 0
47+
ValueError: array_chunk(): Argument #2 ($length) must be greater than 0
4848

4949
-- Testing array_chunk() when size = 4 --
5050
array(1) {
@@ -82,9 +82,9 @@ array(1) {
8282
}
8383

8484
-- Testing array_chunk() when size = 0 --
85-
array_chunk(): Argument #2 ($length) must be greater than 0
86-
array_chunk(): Argument #2 ($length) must be greater than 0
87-
array_chunk(): Argument #2 ($length) must be greater than 0
85+
ValueError: array_chunk(): Argument #2 ($length) must be greater than 0
86+
ValueError: array_chunk(): Argument #2 ($length) must be greater than 0
87+
ValueError: array_chunk(): Argument #2 ($length) must be greater than 0
8888

8989
-- Testing array_chunk() when size = 1 --
9090
array(3) {

‎ext/standard/tests/array/array_combine_error2.phpt‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,24 @@ var_dump( array_combine(array(), array()) );
1212
echo "\n-- Testing array_combine() function with empty array for \$keys argument --\n";
1313
try {
1414
var_dump( array_combine(array(), array(1, 2)) );
15-
} catch (\ValueError $e) {
16-
echo $e->getMessage();
15+
} catch (Throwable $e) {
16+
echo $e::class, ': ', $e->getMessage(), "\n";
1717
}
1818

1919
// Testing array_combine by passing empty array to $values
20-
echo "\n-- Testing array_combine() function with empty array for \$values argument --\n";
20+
echo "-- Testing array_combine() function with empty array for \$values argument --\n";
2121
try {
2222
var_dump( array_combine(array(1, 2), array()) );
23-
} catch (\ValueError $e) {
24-
echo $e->getMessage();
23+
} catch (Throwable $e) {
24+
echo $e::class, ': ', $e->getMessage(), "\n";
2525
}
2626

2727
// Testing array_combine with arrays having unequal number of elements
28-
echo "\n-- Testing array_combine() function by passing array with unequal number of elements --\n";
28+
echo "-- Testing array_combine() function by passing array with unequal number of elements --\n";
2929
try {
3030
var_dump( array_combine(array(1, 2), array(1, 2, 3)) );
31-
} catch (\ValueError $e) {
32-
echo $e->getMessage();
31+
} catch (Throwable $e) {
32+
echo $e::class, ': ', $e->getMessage(), "\n";
3333
}
3434

3535
?>
@@ -41,8 +41,8 @@ array(0) {
4141
}
4242

4343
-- Testing array_combine() function with empty array for $keys argument --
44-
array_combine(): Argument #1 ($keys) and argument #2 ($values) must have the same number of elements
44+
ValueError: array_combine(): Argument #1 ($keys) and argument #2 ($values) must have the same number of elements
4545
-- Testing array_combine() function with empty array for $values argument --
46-
array_combine(): Argument #1 ($keys) and argument #2 ($values) must have the same number of elements
46+
ValueError: array_combine(): Argument #1 ($keys) and argument #2 ($values) must have the same number of elements
4747
-- Testing array_combine() function by passing array with unequal number of elements --
48-
array_combine(): Argument #1 ($keys) and argument #2 ($values) must have the same number of elements
48+
ValueError: array_combine(): Argument #1 ($keys) and argument #2 ($values) must have the same number of elements

‎ext/standard/tests/array/array_diff_leak_custom_type_checks.phpt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ array_diff() memory leak with custom type checks
55

66
try {
77
array_diff([123], 'x');
8-
} catch (TypeError $e) {
9-
echo $e->getMessage(), "\n";
8+
} catch (Throwable $e) {
9+
echo $e::class, ': ', $e->getMessage(), "\n";
1010
}
1111

1212
?>
1313
--EXPECT--
14-
array_diff(): Argument #2 must be of type array, string given
14+
TypeError: array_diff(): Argument #2 must be of type array, string given

‎ext/standard/tests/array/array_diff_max_elements.phpt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ $power = 20; // Chosen to be well within a memory_limit
77
$arr = range(0, 2**$power);
88
try {
99
array_diff(...array_fill(0, 2**(32-$power), $arr));
10-
} catch (Error $e) {
11-
echo $e->getMessage(), "\n";
10+
} catch (Throwable $e) {
11+
echo $e::class, ': ', $e->getMessage(), "\n";
1212
}
1313

1414
?>
1515
--EXPECTF--
16-
The total number of elements must be lower than %d
16+
Error: The total number of elements must be lower than %d

‎ext/standard/tests/array/array_fill_error.phpt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ $val = 1;
1111

1212
try {
1313
var_dump( array_fill($start_key,$num,$val) );
14-
} catch (\ValueError $e) {
15-
echo $e->getMessage() . "\n";
14+
} catch (Throwable $e) {
15+
echo $e::class, ': ', $e->getMessage(), "\n";
1616
}
1717

1818
?>
1919
--EXPECT--
2020
*** Testing array_fill() : error conditions ***
21-
array_fill(): Argument #2 ($count) must be greater than or equal to 0
21+
ValueError: array_fill(): Argument #2 ($count) must be greater than or equal to 0

‎ext/standard/tests/array/array_fill_error2.phpt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ $intMax = 2147483647;
99
// calling array_fill() with 'count' larger than INT_MAX
1010
try {
1111
$array = array_fill(0, $intMax+1, 1);
12-
} catch (\ValueError $e) {
13-
echo $e->getMessage() . "\n";
12+
} catch (Throwable $e) {
13+
echo $e::class, ': ', $e->getMessage(), "\n";
1414
}
1515

1616
// calling array_fill() with 'count' equals to INT_MAX
1717
$array = array_fill(0, $intMax, 1);
1818

1919
?>
2020
--EXPECTF--
21-
array_fill(): Argument #2 ($count) is too large
21+
ValueError: array_fill(): Argument #2 ($count) is too large
2222

2323
Fatal error: Possible integer overflow in memory allocation (%d * %d + %d) in %s on line %d

‎ext/standard/tests/array/array_fill_variation6.phpt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ var_dump(
99
);
1010
try {
1111
$a[] = "bar";
12-
} catch (Error $ex) {
13-
echo $ex->getMessage(), PHP_EOL;
12+
} catch (Throwable $ex) {
13+
echo $ex::class, ': ', $ex->getMessage(), "\n";
1414
}
1515
?>
1616
--EXPECT--
1717
int(1)
1818
bool(true)
19-
Cannot add element to the array as the next element is already occupied
19+
Error: Cannot add element to the array as the next element is already occupied

‎ext/standard/tests/array/array_filter_invalid_mode.phpt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Test array_filter() function : usage variations - mode exception
66
try {
77
var_dump(array_filter([], mode: 999));
88
} catch (Throwable $e) {
9-
echo $e::class . ': '.$e->getMessage(), "\n";
9+
echo $e::class, ': ', $e->getMessage(), "\n";
1010
}
1111

1212
echo "Done"

0 commit comments

Comments
 (0)