Skip to content

Commit c70f92c

Browse files
GirgiasGirgias
committed
Promote warning to error in array_chunk()
1 parent 7c6acc2 commit c70f92c

29 files changed

+144
-280
lines changed

‎ext/standard/array.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6356,7 +6356,7 @@ PHP_FUNCTION(array_chunk)
63566356

63576357
/* Do bounds checking for size parameter. */
63586358
if (size < 1) {
6359-
php_error_docref(NULL, E_WARNING, "Size parameter expected to be greater than 0");
6359+
zend_throw_error(NULL, "Size parameter expected to be greater than 0");
63606360
return;
63616361
}
63626362

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

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

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

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,29 @@ basic array_chunk test
33
--FILE--
44
<?php
55
$input_array = array('a', 'b', 'c', 'd', 'e');
6-
var_dump(array_chunk($input_array, 0));
7-
var_dump(array_chunk($input_array, 0, true));
6+
7+
try {
8+
var_dump(array_chunk($input_array, 0));
9+
} catch (\Error $e) {
10+
echo $e->getMessage() . "\n";
11+
}
12+
13+
try {
14+
var_dump(array_chunk($input_array, 0, true));
15+
} catch (\Error $e) {
16+
echo $e->getMessage() . "\n";
17+
}
18+
819
var_dump(array_chunk($input_array, 1));
920
var_dump(array_chunk($input_array, 1, true));
1021
var_dump(array_chunk($input_array, 2));
1122
var_dump(array_chunk($input_array, 2, true));
1223
var_dump(array_chunk($input_array, 10));
1324
var_dump(array_chunk($input_array, 10, true));
1425
?>
15-
--EXPECTF--
16-
Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
17-
NULL
18-
19-
Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
20-
NULL
26+
--EXPECT--
27+
Size parameter expected to be greater than 0
28+
Size parameter expected to be greater than 0
2129
array(5) {
2230
[0]=>
2331
array(1) {

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

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ array_chunk() - variation 10
44
<?php
55
$array = array (1 => 1, 2 => 2, 3 => 3);
66
var_dump ($array);
7-
for ($i = 0; $i < (sizeof($array) + 1); $i++) {
7+
for ($i = 1; $i < (sizeof($array) + 1); $i++) {
88
echo "[$i]\n";
9-
var_dump (@array_chunk ($array, $i));
10-
var_dump (@array_chunk ($array, $i, TRUE));
11-
var_dump (@array_chunk ($array, $i, FALSE));
9+
var_dump (array_chunk ($array, $i));
10+
var_dump (array_chunk ($array, $i, TRUE));
11+
var_dump (array_chunk ($array, $i, FALSE));
1212
echo "\n";
1313
}
1414
?>
@@ -21,11 +21,6 @@ array(3) {
2121
[3]=>
2222
int(3)
2323
}
24-
[0]
25-
NULL
26-
NULL
27-
NULL
28-
2924
[1]
3025
array(3) {
3126
[0]=>

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

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ array_chunk() - variation 11
55
$array = array (0 => 0, 3 => 2);
66

77
var_dump ($array);
8-
for ($i = 0; $i < (sizeof($array) + 1); $i++) {
8+
for ($i = 1; $i < (sizeof($array) + 1); $i++) {
99
echo "[$i]\n";
10-
var_dump (@array_chunk ($array, $i));
11-
var_dump (@array_chunk ($array, $i, TRUE));
12-
var_dump (@array_chunk ($array, $i, FALSE));
10+
var_dump (array_chunk ($array, $i));
11+
var_dump (array_chunk ($array, $i, TRUE));
12+
var_dump (array_chunk ($array, $i, FALSE));
1313
echo "\n";
1414
}
1515
?>
@@ -20,11 +20,6 @@ array(2) {
2020
[3]=>
2121
int(2)
2222
}
23-
[0]
24-
NULL
25-
NULL
26-
NULL
27-
2823
[1]
2924
array(2) {
3025
[0]=>

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

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ array_chunk() - variation 12
44
<?php
55
$array = array (1 => 1, 5 => 2, 8 => 3);
66
var_dump ($array);
7-
for ($i = 0; $i < (sizeof($array) + 1); $i++) {
7+
for ($i = 1; $i < (sizeof($array) + 1); $i++) {
88
echo "[$i]\n";
9-
var_dump (@array_chunk ($array, $i));
10-
var_dump (@array_chunk ($array, $i, TRUE));
11-
var_dump (@array_chunk ($array, $i, FALSE));
9+
var_dump (array_chunk ($array, $i));
10+
var_dump (array_chunk ($array, $i, TRUE));
11+
var_dump (array_chunk ($array, $i, FALSE));
1212
echo "\n";
1313
}
1414
?>
@@ -21,11 +21,6 @@ array(3) {
2121
[8]=>
2222
int(3)
2323
}
24-
[0]
25-
NULL
26-
NULL
27-
NULL
28-
2924
[1]
3025
array(3) {
3126
[0]=>

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

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ array_chunk() - variation 13
44
<?php
55
$array = array (1, 2);
66
var_dump ($array);
7-
for ($i = 0; $i < (sizeof($array) + 1); $i++) {
7+
for ($i = 1; $i < (sizeof($array) + 1); $i++) {
88
echo "[$i]\n";
9-
var_dump (@array_chunk ($array, $i));
10-
var_dump (@array_chunk ($array, $i, TRUE));
11-
var_dump (@array_chunk ($array, $i, FALSE));
9+
var_dump (array_chunk ($array, $i));
10+
var_dump (array_chunk ($array, $i, TRUE));
11+
var_dump (array_chunk ($array, $i, FALSE));
1212
echo "\n";
1313
}
1414
?>
@@ -19,11 +19,6 @@ array(2) {
1919
[1]=>
2020
int(2)
2121
}
22-
[0]
23-
NULL
24-
NULL
25-
NULL
26-
2722
[1]
2823
array(2) {
2924
[0]=>

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

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ array_chunk() - variation 14
44
<?php
55
$array = array (0, 1, 2);
66
var_dump ($array);
7-
for ($i = 0; $i < (sizeof($array) + 1); $i++) {
7+
for ($i = 1; $i < (sizeof($array) + 1); $i++) {
88
echo "[$i]\n";
9-
var_dump (@array_chunk ($array, $i));
10-
var_dump (@array_chunk ($array, $i, TRUE));
11-
var_dump (@array_chunk ($array, $i, FALSE));
9+
var_dump (array_chunk ($array, $i));
10+
var_dump (array_chunk ($array, $i, TRUE));
11+
var_dump (array_chunk ($array, $i, FALSE));
1212
echo "\n";
1313
}
1414
?>
@@ -21,11 +21,6 @@ array(3) {
2121
[2]=>
2222
int(2)
2323
}
24-
[0]
25-
NULL
26-
NULL
27-
NULL
28-
2924
[1]
3025
array(3) {
3126
[0]=>

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

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ array_chunk() - variation 15
44
<?php
55
$array = array (1, 2, 3);
66
var_dump ($array);
7-
for ($i = 0; $i < (sizeof($array) + 1); $i++) {
7+
for ($i = 1; $i < (sizeof($array) + 1); $i++) {
88
echo "[$i]\n";
9-
var_dump (@array_chunk ($array, $i));
10-
var_dump (@array_chunk ($array, $i, TRUE));
11-
var_dump (@array_chunk ($array, $i, FALSE));
9+
var_dump (array_chunk ($array, $i));
10+
var_dump (array_chunk ($array, $i, TRUE));
11+
var_dump (array_chunk ($array, $i, FALSE));
1212
echo "\n";
1313
}
1414
?>
@@ -21,11 +21,6 @@ array(3) {
2121
[2]=>
2222
int(3)
2323
}
24-
[0]
25-
NULL
26-
NULL
27-
NULL
28-
2924
[1]
3025
array(3) {
3126
[0]=>

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

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ array_chunk() - variation 16
44
<?php
55
$array = array (0, 1, 2, 3);
66
var_dump ($array);
7-
for ($i = 0; $i < (sizeof($array) + 1); $i++) {
7+
for ($i = 1; $i < (sizeof($array) + 1); $i++) {
88
echo "[$i]\n";
9-
var_dump (@array_chunk ($array, $i));
10-
var_dump (@array_chunk ($array, $i, TRUE));
11-
var_dump (@array_chunk ($array, $i, FALSE));
9+
var_dump (array_chunk ($array, $i));
10+
var_dump (array_chunk ($array, $i, TRUE));
11+
var_dump (array_chunk ($array, $i, FALSE));
1212
echo "\n";
1313
}
1414
?>
@@ -23,11 +23,6 @@ array(4) {
2323
[3]=>
2424
int(3)
2525
}
26-
[0]
27-
NULL
28-
NULL
29-
NULL
30-
3126
[1]
3227
array(4) {
3328
[0]=>

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

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ array_chunk() - variation 17
44
<?php
55
$array = array (1, 2, 3, 4);
66
var_dump ($array);
7-
for ($i = 0; $i < (sizeof($array) + 1); $i++) {
7+
for ($i = 1; $i < (sizeof($array) + 1); $i++) {
88
echo "[$i]\n";
9-
var_dump (@array_chunk ($array, $i));
10-
var_dump (@array_chunk ($array, $i, TRUE));
11-
var_dump (@array_chunk ($array, $i, FALSE));
9+
var_dump (array_chunk ($array, $i));
10+
var_dump (array_chunk ($array, $i, TRUE));
11+
var_dump (array_chunk ($array, $i, FALSE));
1212
echo "\n";
1313
}
1414
?>
@@ -23,11 +23,6 @@ array(4) {
2323
[3]=>
2424
int(4)
2525
}
26-
[0]
27-
NULL
28-
NULL
29-
NULL
30-
3126
[1]
3227
array(4) {
3328
[0]=>

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

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ array_chunk() - variation 18
44
<?php
55
$array = array (0, 1, 2, 3, 4);
66
var_dump ($array);
7-
for ($i = 0; $i < (sizeof($array) + 1); $i++) {
7+
for ($i = 1; $i < (sizeof($array) + 1); $i++) {
88
echo "[$i]\n";
9-
var_dump (@array_chunk ($array, $i));
10-
var_dump (@array_chunk ($array, $i, TRUE));
11-
var_dump (@array_chunk ($array, $i, FALSE));
9+
var_dump (array_chunk ($array, $i));
10+
var_dump (array_chunk ($array, $i, TRUE));
11+
var_dump (array_chunk ($array, $i, FALSE));
1212
echo "\n";
1313
}
1414
?>
@@ -25,11 +25,6 @@ array(5) {
2525
[4]=>
2626
int(4)
2727
}
28-
[0]
29-
NULL
30-
NULL
31-
NULL
32-
3328
[1]
3429
array(5) {
3530
[0]=>

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

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ array_chunk() - variation 19
44
<?php
55
$array = array (1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
66
var_dump ($array);
7-
for ($i = 0; $i < (sizeof($array) + 1); $i++) {
7+
for ($i = 1; $i < (sizeof($array) + 1); $i++) {
88
echo "[$i]\n";
9-
var_dump (@array_chunk ($array, $i));
10-
var_dump (@array_chunk ($array, $i, TRUE));
11-
var_dump (@array_chunk ($array, $i, FALSE));
9+
var_dump (array_chunk ($array, $i));
10+
var_dump (array_chunk ($array, $i, TRUE));
11+
var_dump (array_chunk ($array, $i, FALSE));
1212
echo "\n";
1313
}
1414
?>
@@ -35,11 +35,6 @@ array(10) {
3535
[9]=>
3636
int(10)
3737
}
38-
[0]
39-
NULL
40-
NULL
41-
NULL
42-
4338
[1]
4439
array(10) {
4540
[0]=>

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

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ array_chunk() - variation 20
44
<?php
55
$array = array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
66
var_dump ($array);
7-
for ($i = 0; $i < (sizeof($array) + 1); $i++) {
7+
for ($i = 1; $i < (sizeof($array) + 1); $i++) {
88
echo "[$i]\n";
9-
var_dump (@array_chunk ($array, $i));
10-
var_dump (@array_chunk ($array, $i, TRUE));
11-
var_dump (@array_chunk ($array, $i, FALSE));
9+
var_dump (array_chunk ($array, $i));
10+
var_dump (array_chunk ($array, $i, TRUE));
11+
var_dump (array_chunk ($array, $i, FALSE));
1212
echo "\n";
1313
}
1414
?>
@@ -37,11 +37,6 @@ array(11) {
3737
[10]=>
3838
int(10)
3939
}
40-
[0]
41-
NULL
42-
NULL
43-
NULL
44-
4540
[1]
4641
array(11) {
4742
[0]=>

0 commit comments

Comments
 (0)