Skip to content

ext/standard: applied fixers to improve test robustness #23136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NickSdot wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ext/standard: applied fixers to improve test robustness #23136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions ext/standard/tests/array/GHSA-h96m-rvf9-jgm2.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ $arr = range(0, 2**$power);
try {
array_merge(...array_fill(0, 2**(32-$power), $arr));
} catch (Error $e) {
echo $e->getMessage(), "\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}

?>
--EXPECTF--
The total number of elements must be lower than %d
Error: The total number of elements must be lower than %d
8 changes: 4 additions & 4 deletions ext/standard/tests/array/array_chunk2.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ $input_array = array('a', 'b', 'c', 'd', 'e');
try {
var_dump(array_chunk($input_array, 0));
} catch (\ValueError $e) {
echo $e->getMessage() . "\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}

try {
var_dump(array_chunk($input_array, 0, true));
} catch (\ValueError $e) {
echo $e->getMessage() . "\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}

var_dump(array_chunk($input_array, 1));
Expand All @@ -24,8 +24,8 @@ var_dump(array_chunk($input_array, 10));
var_dump(array_chunk($input_array, 10, true));
?>
--EXPECT--
array_chunk(): Argument #2 ($length) must be greater than 0
array_chunk(): Argument #2 ($length) must be greater than 0
ValueError: array_chunk(): Argument #2 ($length) must be greater than 0
ValueError: array_chunk(): Argument #2 ($length) must be greater than 0
array(5) {
[0]=>
array(1) {
Expand Down
18 changes: 9 additions & 9 deletions ext/standard/tests/array/array_chunk_variation5.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,27 +24,27 @@ foreach ($sizes as $size){
try {
var_dump( array_chunk($input_array, $size) );
} catch (\ValueError $e) {
echo $e->getMessage() . "\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
try {
var_dump( array_chunk($input_array, $size, true) );
} catch (\ValueError $e) {
echo $e->getMessage() . "\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
try {
var_dump( array_chunk($input_array, $size, false) );
} catch (\ValueError $e) {
echo $e->getMessage() . "\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
}
?>
--EXPECT--
*** Testing array_chunk() : usage variations ***

-- Testing array_chunk() when size = -1 --
array_chunk(): Argument #2 ($length) must be greater than 0
array_chunk(): Argument #2 ($length) must be greater than 0
array_chunk(): Argument #2 ($length) must be greater than 0
ValueError: array_chunk(): Argument #2 ($length) must be greater than 0
ValueError: array_chunk(): Argument #2 ($length) must be greater than 0
ValueError: array_chunk(): Argument #2 ($length) must be greater than 0

-- Testing array_chunk() when size = 4 --
array(1) {
Expand Down Expand Up @@ -82,9 +82,9 @@ array(1) {
}

-- Testing array_chunk() when size = 0 --
array_chunk(): Argument #2 ($length) must be greater than 0
array_chunk(): Argument #2 ($length) must be greater than 0
array_chunk(): Argument #2 ($length) must be greater than 0
ValueError: array_chunk(): Argument #2 ($length) must be greater than 0
ValueError: array_chunk(): Argument #2 ($length) must be greater than 0
ValueError: array_chunk(): Argument #2 ($length) must be greater than 0

-- Testing array_chunk() when size = 1 --
array(3) {
Expand Down
24 changes: 12 additions & 12 deletions ext/standard/tests/array/array_column_scalar_index_strict_types.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,56 +8,56 @@ echo "\n-- Testing array_column() column key parameter should be a string or an
try {
var_dump(array_column([['php7', 'foo'], ['php8', 'bar']], false));
} catch (\TypeError $e) {
echo $e->getMessage() . "\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
try {
var_dump(array_column([['php7', 'foo'], ['php8', 'bar']], true));
} catch (\TypeError $e) {
echo $e->getMessage() . "\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}

echo "\n-- Testing array_column() column key parameter should be a string or integer (testing array) --\n";
try {
var_dump(array_column([['php7', 'foo'], ['php8', 'bar']], array()));
} catch (\TypeError $e) {
echo $e->getMessage() . "\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}

echo "\n-- Testing array_column() index key parameter should be a string or an integer (testing bool) --\n";
try {
var_dump(array_column([['php' => 7, 'foo'], ['php' => 8, 'bar']], 'php', false));
} catch (\TypeError $e) {
echo $e->getMessage() . "\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
try {
var_dump(array_column([['php' => 7, 'foo'], ['php' => 8, 'bar']], 'php', true));
} catch (\TypeError $e) {
echo $e->getMessage() . "\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}

echo "\n-- Testing array_column() index key parameter should be a string or integer (testing array) --\n";
try {
var_dump(array_column([['php' => 7, 'foo'], ['php' => 8, 'bar']], 'php', array()));
} catch (\TypeError $e) {
echo $e->getMessage() . "\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}

?>

DONE
--EXPECT--
-- Testing array_column() column key parameter should be a string or an integer (testing bool) --
array_column(): Argument #2 ($column_key) must be of type string|int|null, false given
array_column(): Argument #2 ($column_key) must be of type string|int|null, true given
TypeError: array_column(): Argument #2 ($column_key) must be of type string|int|null, false given
TypeError: array_column(): Argument #2 ($column_key) must be of type string|int|null, true given

-- Testing array_column() column key parameter should be a string or integer (testing array) --
array_column(): Argument #2 ($column_key) must be of type string|int|null, array given
TypeError: array_column(): Argument #2 ($column_key) must be of type string|int|null, array given

-- Testing array_column() index key parameter should be a string or an integer (testing bool) --
array_column(): Argument #3 ($index_key) must be of type string|int|null, false given
array_column(): Argument #3 ($index_key) must be of type string|int|null, true given
TypeError: array_column(): Argument #3 ($index_key) must be of type string|int|null, false given
TypeError: array_column(): Argument #3 ($index_key) must be of type string|int|null, true given

-- Testing array_column() index key parameter should be a string or integer (testing array) --
array_column(): Argument #3 ($index_key) must be of type string|int|null, array given
TypeError: array_column(): Argument #3 ($index_key) must be of type string|int|null, array given

DONE
16 changes: 8 additions & 8 deletions ext/standard/tests/array/array_column_scalar_index_weak_types.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,38 +6,38 @@ echo "\n-- Testing array_column() column key parameter should be a string or an
try {
var_dump(array_column([['php7', 'foo'], ['php8', 'bar']], false));
} catch (\TypeError $e) {
echo $e->getMessage() . "\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
try {
var_dump(array_column([['php7', 'foo'], ['php8', 'bar']], true));
} catch (\TypeError $e) {
echo $e->getMessage() . "\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}

echo "\n-- Testing array_column() column key parameter should be a string or integer (testing array) --\n";
try {
var_dump(array_column([['php7', 'foo'], ['php8', 'bar']], array()));
} catch (\TypeError $e) {
echo $e->getMessage() . "\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}

echo "\n-- Testing array_column() index key parameter should be a string or an integer (testing bool) --\n";
try {
var_dump(array_column([['php' => 7, 'foo'], ['php' => 8, 'bar']], 'php', false));
} catch (\TypeError $e) {
echo $e->getMessage() . "\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
try {
var_dump(array_column([['php' => 7, 'foo'], ['php' => 8, 'bar']], 'php', true));
} catch (\TypeError $e) {
echo $e->getMessage() . "\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}

echo "\n-- Testing array_column() index key parameter should be a string or integer (testing array) --\n";
try {
var_dump(array_column([['php' => 7, 'foo'], ['php' => 8, 'bar']], 'php', array()));
} catch (\TypeError $e) {
echo $e->getMessage() . "\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}

?>
Expand All @@ -59,7 +59,7 @@ array(2) {
}

-- Testing array_column() column key parameter should be a string or integer (testing array) --
array_column(): Argument #2 ($column_key) must be of type string|int|null, array given
TypeError: array_column(): Argument #2 ($column_key) must be of type string|int|null, array given

-- Testing array_column() index key parameter should be a string or an integer (testing bool) --
array(2) {
Expand All @@ -76,6 +76,6 @@ array(2) {
}

-- Testing array_column() index key parameter should be a string or integer (testing array) --
array_column(): Argument #3 ($index_key) must be of type string|int|null, array given
TypeError: array_column(): Argument #3 ($index_key) must be of type string|int|null, array given

DONE
16 changes: 8 additions & 8 deletions ext/standard/tests/array/array_combine_error2.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,23 @@ echo "\n-- Testing array_combine() function with empty array for \$keys argument
try {
var_dump( array_combine(array(), array(1, 2)) );
} catch (\ValueError $e) {
echo $e->getMessage();
echo $e::class, ': ', $e->getMessage(), "\n";
}

// Testing array_combine by passing empty array to $values
echo "\n-- Testing array_combine() function with empty array for \$values argument --\n";
echo "-- Testing array_combine() function with empty array for \$values argument --\n";
try {
var_dump( array_combine(array(1, 2), array()) );
} catch (\ValueError $e) {
echo $e->getMessage();
echo $e::class, ': ', $e->getMessage(), "\n";
}

// Testing array_combine with arrays having unequal number of elements
echo "\n-- Testing array_combine() function by passing array with unequal number of elements --\n";
echo "-- Testing array_combine() function by passing array with unequal number of elements --\n";
try {
var_dump( array_combine(array(1, 2), array(1, 2, 3)) );
} catch (\ValueError $e) {
echo $e->getMessage();
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}

?>
Expand All @@ -41,8 +41,8 @@ array(0) {
}

-- Testing array_combine() function with empty array for $keys argument --
array_combine(): Argument #1 ($keys) and argument #2 ($values) must have the same number of elements
ValueError: array_combine(): Argument #1 ($keys) and argument #2 ($values) must have the same number of elements
-- Testing array_combine() function with empty array for $values argument --
array_combine(): Argument #1 ($keys) and argument #2 ($values) must have the same number of elements
ValueError: array_combine(): Argument #1 ($keys) and argument #2 ($values) must have the same number of elements
-- Testing array_combine() function by passing array with unequal number of elements --
array_combine(): Argument #1 ($keys) and argument #2 ($values) must have the same number of elements
ValueError: array_combine(): Argument #1 ($keys) and argument #2 ($values) must have the same number of elements
4 changes: 2 additions & 2 deletions ext/standard/tests/array/array_diff_1.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ $c = array(5);
try {
array_diff($a, $b, $c);
} catch (TypeError $e) {
echo $e->getMessage(), "\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
//-=-=-=-=-=-
echo "OK!";
?>
--EXPECT--
array_diff(): Argument #2 must be of type array, int given
TypeError: array_diff(): Argument #2 must be of type array, int given
OK!
Loading
Loading