Skip to content

Promote warning to error in array_chunk() #4574

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.

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

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ext/standard/array.c
Original file line number Diff line number Diff line change
Expand Up @@ -6354,7 +6354,7 @@ PHP_FUNCTION(array_chunk)

/* Do bounds checking for size parameter. */
if (size < 1) {
php_error_docref(NULL, E_WARNING, "Size parameter expected to be greater than 0");
zend_throw_error(NULL, "Size parameter expected to be greater than 0");
return;
}

Expand Down
21 changes: 0 additions & 21 deletions ext/standard/tests/array/array_chunk.phpt

This file was deleted.

24 changes: 16 additions & 8 deletions ext/standard/tests/array/array_chunk2.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,29 @@ basic array_chunk test
--FILE--
<?php
$input_array = array('a', 'b', 'c', 'd', 'e');
var_dump(array_chunk($input_array, 0));
var_dump(array_chunk($input_array, 0, true));

try {
var_dump(array_chunk($input_array, 0));
} catch (\Error $e) {
echo $e->getMessage() . "\n";
}

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

var_dump(array_chunk($input_array, 1));
var_dump(array_chunk($input_array, 1, true));
var_dump(array_chunk($input_array, 2));
var_dump(array_chunk($input_array, 2, true));
var_dump(array_chunk($input_array, 10));
var_dump(array_chunk($input_array, 10, true));
?>
--EXPECTF--
Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
NULL

Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
NULL
--EXPECT--
Size parameter expected to be greater than 0
Size parameter expected to be greater than 0
array(5) {
[0]=>
array(1) {
Expand Down
13 changes: 4 additions & 9 deletions ext/standard/tests/array/array_chunk_variation10.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ array_chunk() - variation 10
<?php
$array = array (1 => 1, 2 => 2, 3 => 3);
var_dump ($array);
for ($i = 0; $i < (sizeof($array) + 1); $i++) {
for ($i = 1; $i < (sizeof($array) + 1); $i++) {
echo "[$i]\n";
var_dump (@array_chunk ($array, $i));
var_dump (@array_chunk ($array, $i, TRUE));
var_dump (@array_chunk ($array, $i, FALSE));
var_dump (array_chunk ($array, $i));
var_dump (array_chunk ($array, $i, TRUE));
var_dump (array_chunk ($array, $i, FALSE));
echo "\n";
}
?>
Expand All @@ -21,11 +21,6 @@ array(3) {
[3]=>
int(3)
}
[0]
NULL
NULL
NULL

[1]
array(3) {
[0]=>
Expand Down
13 changes: 4 additions & 9 deletions ext/standard/tests/array/array_chunk_variation11.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ array_chunk() - variation 11
$array = array (0 => 0, 3 => 2);

var_dump ($array);
for ($i = 0; $i < (sizeof($array) + 1); $i++) {
for ($i = 1; $i < (sizeof($array) + 1); $i++) {
echo "[$i]\n";
var_dump (@array_chunk ($array, $i));
var_dump (@array_chunk ($array, $i, TRUE));
var_dump (@array_chunk ($array, $i, FALSE));
var_dump (array_chunk ($array, $i));
var_dump (array_chunk ($array, $i, TRUE));
var_dump (array_chunk ($array, $i, FALSE));
echo "\n";
}
?>
Expand All @@ -20,11 +20,6 @@ array(2) {
[3]=>
int(2)
}
[0]
NULL
NULL
NULL

[1]
array(2) {
[0]=>
Expand Down
13 changes: 4 additions & 9 deletions ext/standard/tests/array/array_chunk_variation12.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ array_chunk() - variation 12
<?php
$array = array (1 => 1, 5 => 2, 8 => 3);
var_dump ($array);
for ($i = 0; $i < (sizeof($array) + 1); $i++) {
for ($i = 1; $i < (sizeof($array) + 1); $i++) {
echo "[$i]\n";
var_dump (@array_chunk ($array, $i));
var_dump (@array_chunk ($array, $i, TRUE));
var_dump (@array_chunk ($array, $i, FALSE));
var_dump (array_chunk ($array, $i));
var_dump (array_chunk ($array, $i, TRUE));
var_dump (array_chunk ($array, $i, FALSE));
echo "\n";
}
?>
Expand All @@ -21,11 +21,6 @@ array(3) {
[8]=>
int(3)
}
[0]
NULL
NULL
NULL

[1]
array(3) {
[0]=>
Expand Down
13 changes: 4 additions & 9 deletions ext/standard/tests/array/array_chunk_variation13.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ array_chunk() - variation 13
<?php
$array = array (1, 2);
var_dump ($array);
for ($i = 0; $i < (sizeof($array) + 1); $i++) {
for ($i = 1; $i < (sizeof($array) + 1); $i++) {
echo "[$i]\n";
var_dump (@array_chunk ($array, $i));
var_dump (@array_chunk ($array, $i, TRUE));
var_dump (@array_chunk ($array, $i, FALSE));
var_dump (array_chunk ($array, $i));
var_dump (array_chunk ($array, $i, TRUE));
var_dump (array_chunk ($array, $i, FALSE));
echo "\n";
}
?>
Expand All @@ -19,11 +19,6 @@ array(2) {
[1]=>
int(2)
}
[0]
NULL
NULL
NULL

[1]
array(2) {
[0]=>
Expand Down
13 changes: 4 additions & 9 deletions ext/standard/tests/array/array_chunk_variation14.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ array_chunk() - variation 14
<?php
$array = array (0, 1, 2);
var_dump ($array);
for ($i = 0; $i < (sizeof($array) + 1); $i++) {
for ($i = 1; $i < (sizeof($array) + 1); $i++) {
echo "[$i]\n";
var_dump (@array_chunk ($array, $i));
var_dump (@array_chunk ($array, $i, TRUE));
var_dump (@array_chunk ($array, $i, FALSE));
var_dump (array_chunk ($array, $i));
var_dump (array_chunk ($array, $i, TRUE));
var_dump (array_chunk ($array, $i, FALSE));
echo "\n";
}
?>
Expand All @@ -21,11 +21,6 @@ array(3) {
[2]=>
int(2)
}
[0]
NULL
NULL
NULL

[1]
array(3) {
[0]=>
Expand Down
13 changes: 4 additions & 9 deletions ext/standard/tests/array/array_chunk_variation15.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ array_chunk() - variation 15
<?php
$array = array (1, 2, 3);
var_dump ($array);
for ($i = 0; $i < (sizeof($array) + 1); $i++) {
for ($i = 1; $i < (sizeof($array) + 1); $i++) {
echo "[$i]\n";
var_dump (@array_chunk ($array, $i));
var_dump (@array_chunk ($array, $i, TRUE));
var_dump (@array_chunk ($array, $i, FALSE));
var_dump (array_chunk ($array, $i));
var_dump (array_chunk ($array, $i, TRUE));
var_dump (array_chunk ($array, $i, FALSE));
echo "\n";
}
?>
Expand All @@ -21,11 +21,6 @@ array(3) {
[2]=>
int(3)
}
[0]
NULL
NULL
NULL

[1]
array(3) {
[0]=>
Expand Down
13 changes: 4 additions & 9 deletions ext/standard/tests/array/array_chunk_variation16.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ array_chunk() - variation 16
<?php
$array = array (0, 1, 2, 3);
var_dump ($array);
for ($i = 0; $i < (sizeof($array) + 1); $i++) {
for ($i = 1; $i < (sizeof($array) + 1); $i++) {
echo "[$i]\n";
var_dump (@array_chunk ($array, $i));
var_dump (@array_chunk ($array, $i, TRUE));
var_dump (@array_chunk ($array, $i, FALSE));
var_dump (array_chunk ($array, $i));
var_dump (array_chunk ($array, $i, TRUE));
var_dump (array_chunk ($array, $i, FALSE));
echo "\n";
}
?>
Expand All @@ -23,11 +23,6 @@ array(4) {
[3]=>
int(3)
}
[0]
NULL
NULL
NULL

[1]
array(4) {
[0]=>
Expand Down
13 changes: 4 additions & 9 deletions ext/standard/tests/array/array_chunk_variation17.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ array_chunk() - variation 17
<?php
$array = array (1, 2, 3, 4);
var_dump ($array);
for ($i = 0; $i < (sizeof($array) + 1); $i++) {
for ($i = 1; $i < (sizeof($array) + 1); $i++) {
echo "[$i]\n";
var_dump (@array_chunk ($array, $i));
var_dump (@array_chunk ($array, $i, TRUE));
var_dump (@array_chunk ($array, $i, FALSE));
var_dump (array_chunk ($array, $i));
var_dump (array_chunk ($array, $i, TRUE));
var_dump (array_chunk ($array, $i, FALSE));
echo "\n";
}
?>
Expand All @@ -23,11 +23,6 @@ array(4) {
[3]=>
int(4)
}
[0]
NULL
NULL
NULL

[1]
array(4) {
[0]=>
Expand Down
13 changes: 4 additions & 9 deletions ext/standard/tests/array/array_chunk_variation18.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ array_chunk() - variation 18
<?php
$array = array (0, 1, 2, 3, 4);
var_dump ($array);
for ($i = 0; $i < (sizeof($array) + 1); $i++) {
for ($i = 1; $i < (sizeof($array) + 1); $i++) {
echo "[$i]\n";
var_dump (@array_chunk ($array, $i));
var_dump (@array_chunk ($array, $i, TRUE));
var_dump (@array_chunk ($array, $i, FALSE));
var_dump (array_chunk ($array, $i));
var_dump (array_chunk ($array, $i, TRUE));
var_dump (array_chunk ($array, $i, FALSE));
echo "\n";
}
?>
Expand All @@ -25,11 +25,6 @@ array(5) {
[4]=>
int(4)
}
[0]
NULL
NULL
NULL

[1]
array(5) {
[0]=>
Expand Down
13 changes: 4 additions & 9 deletions ext/standard/tests/array/array_chunk_variation19.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ array_chunk() - variation 19
<?php
$array = array (1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
var_dump ($array);
for ($i = 0; $i < (sizeof($array) + 1); $i++) {
for ($i = 1; $i < (sizeof($array) + 1); $i++) {
echo "[$i]\n";
var_dump (@array_chunk ($array, $i));
var_dump (@array_chunk ($array, $i, TRUE));
var_dump (@array_chunk ($array, $i, FALSE));
var_dump (array_chunk ($array, $i));
var_dump (array_chunk ($array, $i, TRUE));
var_dump (array_chunk ($array, $i, FALSE));
echo "\n";
}
?>
Expand All @@ -35,11 +35,6 @@ array(10) {
[9]=>
int(10)
}
[0]
NULL
NULL
NULL

[1]
array(10) {
[0]=>
Expand Down
13 changes: 4 additions & 9 deletions ext/standard/tests/array/array_chunk_variation20.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ array_chunk() - variation 20
<?php
$array = array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
var_dump ($array);
for ($i = 0; $i < (sizeof($array) + 1); $i++) {
for ($i = 1; $i < (sizeof($array) + 1); $i++) {
echo "[$i]\n";
var_dump (@array_chunk ($array, $i));
var_dump (@array_chunk ($array, $i, TRUE));
var_dump (@array_chunk ($array, $i, FALSE));
var_dump (array_chunk ($array, $i));
var_dump (array_chunk ($array, $i, TRUE));
var_dump (array_chunk ($array, $i, FALSE));
echo "\n";
}
?>
Expand Down Expand Up @@ -37,11 +37,6 @@ array(11) {
[10]=>
int(10)
}
[0]
NULL
NULL
NULL

[1]
array(11) {
[0]=>
Expand Down
Loading