summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Peter Banyard <girgias@php.net>2019-08-20 23:30:20 +0200
committerGeorge Peter Banyard <girgias@php.net>2019-08-21 18:07:35 +0200
commitc70f92caf81fe84ac8e58e27a695b1622805bfcc (patch)
tree4dac640436e3e8fb6524f1d5b32879fc000b8ea1
parent7c6acc2eefcaf1b3fd03b1730db84f1f58fffec6 (diff)
downloadphp-git-c70f92caf81fe84ac8e58e27a695b1622805bfcc.tar.gz
Promote warning to error in array_chunk()
-rw-r--r--ext/standard/array.c2
-rw-r--r--ext/standard/tests/array/array_chunk.phpt21
-rw-r--r--ext/standard/tests/array/array_chunk2.phpt24
-rw-r--r--ext/standard/tests/array/array_chunk_variation10.phpt13
-rw-r--r--ext/standard/tests/array/array_chunk_variation11.phpt13
-rw-r--r--ext/standard/tests/array/array_chunk_variation12.phpt13
-rw-r--r--ext/standard/tests/array/array_chunk_variation13.phpt13
-rw-r--r--ext/standard/tests/array/array_chunk_variation14.phpt13
-rw-r--r--ext/standard/tests/array/array_chunk_variation15.phpt13
-rw-r--r--ext/standard/tests/array/array_chunk_variation16.phpt13
-rw-r--r--ext/standard/tests/array/array_chunk_variation17.phpt13
-rw-r--r--ext/standard/tests/array/array_chunk_variation18.phpt13
-rw-r--r--ext/standard/tests/array/array_chunk_variation19.phpt13
-rw-r--r--ext/standard/tests/array/array_chunk_variation20.phpt13
-rw-r--r--ext/standard/tests/array/array_chunk_variation21.phpt13
-rw-r--r--ext/standard/tests/array/array_chunk_variation22.phpt13
-rw-r--r--ext/standard/tests/array/array_chunk_variation23.phpt13
-rw-r--r--ext/standard/tests/array/array_chunk_variation24.phpt13
-rw-r--r--ext/standard/tests/array/array_chunk_variation25.phpt13
-rw-r--r--ext/standard/tests/array/array_chunk_variation26.phpt13
-rw-r--r--ext/standard/tests/array/array_chunk_variation27.phpt13
-rw-r--r--ext/standard/tests/array/array_chunk_variation28.phpt13
-rw-r--r--ext/standard/tests/array/array_chunk_variation29.phpt13
-rw-r--r--ext/standard/tests/array/array_chunk_variation30.phpt13
-rw-r--r--ext/standard/tests/array/array_chunk_variation31.phpt13
-rw-r--r--ext/standard/tests/array/array_chunk_variation32.phpt13
-rw-r--r--ext/standard/tests/array/array_chunk_variation5.phpt52
-rw-r--r--ext/standard/tests/array/array_chunk_variation8.phpt13
-rw-r--r--ext/standard/tests/array/array_chunk_variation9.phpt13
29 files changed, 144 insertions, 280 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c
index b99d3222dc..678f32708c 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -6356,7 +6356,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;
}
diff --git a/ext/standard/tests/array/array_chunk.phpt b/ext/standard/tests/array/array_chunk.phpt
deleted file mode 100644
index 2ee77e129c..0000000000
--- a/ext/standard/tests/array/array_chunk.phpt
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-array_chunk()
---FILE--
-<?php
-$array = array ();
-var_dump ($array);
-for ($i = 0; $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));
- echo "\n";
-}
-?>
---EXPECT--
-array(0) {
-}
-[0]
-NULL
-NULL
-NULL
diff --git a/ext/standard/tests/array/array_chunk2.phpt b/ext/standard/tests/array/array_chunk2.phpt
index 6d8b74545e..c02194aa5b 100644
--- a/ext/standard/tests/array/array_chunk2.phpt
+++ b/ext/standard/tests/array/array_chunk2.phpt
@@ -3,8 +3,19 @@ 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));
@@ -12,12 +23,9 @@ 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) {
diff --git a/ext/standard/tests/array/array_chunk_variation10.phpt b/ext/standard/tests/array/array_chunk_variation10.phpt
index 7b4bee172b..be5fcdc7f3 100644
--- a/ext/standard/tests/array/array_chunk_variation10.phpt
+++ b/ext/standard/tests/array/array_chunk_variation10.phpt
@@ -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";
}
?>
@@ -21,11 +21,6 @@ array(3) {
[3]=>
int(3)
}
-[0]
-NULL
-NULL
-NULL
-
[1]
array(3) {
[0]=>
diff --git a/ext/standard/tests/array/array_chunk_variation11.phpt b/ext/standard/tests/array/array_chunk_variation11.phpt
index dca366652d..09ec255744 100644
--- a/ext/standard/tests/array/array_chunk_variation11.phpt
+++ b/ext/standard/tests/array/array_chunk_variation11.phpt
@@ -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";
}
?>
@@ -20,11 +20,6 @@ array(2) {
[3]=>
int(2)
}
-[0]
-NULL
-NULL
-NULL
-
[1]
array(2) {
[0]=>
diff --git a/ext/standard/tests/array/array_chunk_variation12.phpt b/ext/standard/tests/array/array_chunk_variation12.phpt
index 3b87dbab95..f85f2a8c0d 100644
--- a/ext/standard/tests/array/array_chunk_variation12.phpt
+++ b/ext/standard/tests/array/array_chunk_variation12.phpt
@@ -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";
}
?>
@@ -21,11 +21,6 @@ array(3) {
[8]=>
int(3)
}
-[0]
-NULL
-NULL
-NULL
-
[1]
array(3) {
[0]=>
diff --git a/ext/standard/tests/array/array_chunk_variation13.phpt b/ext/standard/tests/array/array_chunk_variation13.phpt
index f6369df1c8..5cd6f0ea34 100644
--- a/ext/standard/tests/array/array_chunk_variation13.phpt
+++ b/ext/standard/tests/array/array_chunk_variation13.phpt
@@ -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";
}
?>
@@ -19,11 +19,6 @@ array(2) {
[1]=>
int(2)
}
-[0]
-NULL
-NULL
-NULL
-
[1]
array(2) {
[0]=>
diff --git a/ext/standard/tests/array/array_chunk_variation14.phpt b/ext/standard/tests/array/array_chunk_variation14.phpt
index f8d1b11790..97fce1e722 100644
--- a/ext/standard/tests/array/array_chunk_variation14.phpt
+++ b/ext/standard/tests/array/array_chunk_variation14.phpt
@@ -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";
}
?>
@@ -21,11 +21,6 @@ array(3) {
[2]=>
int(2)
}
-[0]
-NULL
-NULL
-NULL
-
[1]
array(3) {
[0]=>
diff --git a/ext/standard/tests/array/array_chunk_variation15.phpt b/ext/standard/tests/array/array_chunk_variation15.phpt
index abec754a3d..c48af63f6c 100644
--- a/ext/standard/tests/array/array_chunk_variation15.phpt
+++ b/ext/standard/tests/array/array_chunk_variation15.phpt
@@ -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";
}
?>
@@ -21,11 +21,6 @@ array(3) {
[2]=>
int(3)
}
-[0]
-NULL
-NULL
-NULL
-
[1]
array(3) {
[0]=>
diff --git a/ext/standard/tests/array/array_chunk_variation16.phpt b/ext/standard/tests/array/array_chunk_variation16.phpt
index 18179c8b07..3426f9278b 100644
--- a/ext/standard/tests/array/array_chunk_variation16.phpt
+++ b/ext/standard/tests/array/array_chunk_variation16.phpt
@@ -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";
}
?>
@@ -23,11 +23,6 @@ array(4) {
[3]=>
int(3)
}
-[0]
-NULL
-NULL
-NULL
-
[1]
array(4) {
[0]=>
diff --git a/ext/standard/tests/array/array_chunk_variation17.phpt b/ext/standard/tests/array/array_chunk_variation17.phpt
index 27507ea8cd..1a8bb5d340 100644
--- a/ext/standard/tests/array/array_chunk_variation17.phpt
+++ b/ext/standard/tests/array/array_chunk_variation17.phpt
@@ -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";
}
?>
@@ -23,11 +23,6 @@ array(4) {
[3]=>
int(4)
}
-[0]
-NULL
-NULL
-NULL
-
[1]
array(4) {
[0]=>
diff --git a/ext/standard/tests/array/array_chunk_variation18.phpt b/ext/standard/tests/array/array_chunk_variation18.phpt
index 7f0946f497..593c702ce9 100644
--- a/ext/standard/tests/array/array_chunk_variation18.phpt
+++ b/ext/standard/tests/array/array_chunk_variation18.phpt
@@ -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";
}
?>
@@ -25,11 +25,6 @@ array(5) {
[4]=>
int(4)
}
-[0]
-NULL
-NULL
-NULL
-
[1]
array(5) {
[0]=>
diff --git a/ext/standard/tests/array/array_chunk_variation19.phpt b/ext/standard/tests/array/array_chunk_variation19.phpt
index d51389c9f3..f160cba263 100644
--- a/ext/standard/tests/array/array_chunk_variation19.phpt
+++ b/ext/standard/tests/array/array_chunk_variation19.phpt
@@ -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";
}
?>
@@ -35,11 +35,6 @@ array(10) {
[9]=>
int(10)
}
-[0]
-NULL
-NULL
-NULL
-
[1]
array(10) {
[0]=>
diff --git a/ext/standard/tests/array/array_chunk_variation20.phpt b/ext/standard/tests/array/array_chunk_variation20.phpt
index cd5314ff04..d47279915c 100644
--- a/ext/standard/tests/array/array_chunk_variation20.phpt
+++ b/ext/standard/tests/array/array_chunk_variation20.phpt
@@ -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";
}
?>
@@ -37,11 +37,6 @@ array(11) {
[10]=>
int(10)
}
-[0]
-NULL
-NULL
-NULL
-
[1]
array(11) {
[0]=>
diff --git a/ext/standard/tests/array/array_chunk_variation21.phpt b/ext/standard/tests/array/array_chunk_variation21.phpt
index 678bf16751..e8c7784325 100644
--- a/ext/standard/tests/array/array_chunk_variation21.phpt
+++ b/ext/standard/tests/array/array_chunk_variation21.phpt
@@ -4,11 +4,11 @@ array_chunk() - variation 21
<?php
$array = array ("a" => 1);
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";
}
?>
@@ -17,11 +17,6 @@ array(1) {
["a"]=>
int(1)
}
-[0]
-NULL
-NULL
-NULL
-
[1]
array(1) {
[0]=>
diff --git a/ext/standard/tests/array/array_chunk_variation22.phpt b/ext/standard/tests/array/array_chunk_variation22.phpt
index 45c458ebf9..b0eeade3ab 100644
--- a/ext/standard/tests/array/array_chunk_variation22.phpt
+++ b/ext/standard/tests/array/array_chunk_variation22.phpt
@@ -4,11 +4,11 @@ array_chunk() - variation 22
<?php
$array = array ("b" => 1, "c" => 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";
}
?>
@@ -19,11 +19,6 @@ array(2) {
["c"]=>
int(2)
}
-[0]
-NULL
-NULL
-NULL
-
[1]
array(2) {
[0]=>
diff --git a/ext/standard/tests/array/array_chunk_variation23.phpt b/ext/standard/tests/array/array_chunk_variation23.phpt
index 80b92985b1..87ced15132 100644
--- a/ext/standard/tests/array/array_chunk_variation23.phpt
+++ b/ext/standard/tests/array/array_chunk_variation23.phpt
@@ -4,11 +4,11 @@ array_chunk() - variation 23
<?php
$array = array ("p" => 1, "q" => 2, "r" => 3, "s" => 4, "u" => 5, "v" => 6);
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";
}
?>
@@ -27,11 +27,6 @@ array(6) {
["v"]=>
int(6)
}
-[0]
-NULL
-NULL
-NULL
-
[1]
array(6) {
[0]=>
diff --git a/ext/standard/tests/array/array_chunk_variation24.phpt b/ext/standard/tests/array/array_chunk_variation24.phpt
index e25f53f6b6..69dce7be17 100644
--- a/ext/standard/tests/array/array_chunk_variation24.phpt
+++ b/ext/standard/tests/array/array_chunk_variation24.phpt
@@ -4,11 +4,11 @@ array_chunk() - variation 24
<?php
$array = array ("a" => "A");
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";
}
?>
@@ -17,11 +17,6 @@ array(1) {
["a"]=>
string(1) "A"
}
-[0]
-NULL
-NULL
-NULL
-
[1]
array(1) {
[0]=>
diff --git a/ext/standard/tests/array/array_chunk_variation25.phpt b/ext/standard/tests/array/array_chunk_variation25.phpt
index eae89e952b..09303c30ba 100644
--- a/ext/standard/tests/array/array_chunk_variation25.phpt
+++ b/ext/standard/tests/array/array_chunk_variation25.phpt
@@ -4,11 +4,11 @@ array_chunk() - variation 25
<?php
$array = array ("p" => "A", "q" => "B", "r" => "C", "s" => "D", "u" => "E", "v" => "F");
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";
}
?>
@@ -27,11 +27,6 @@ array(6) {
["v"]=>
string(1) "F"
}
-[0]
-NULL
-NULL
-NULL
-
[1]
array(6) {
[0]=>
diff --git a/ext/standard/tests/array/array_chunk_variation26.phpt b/ext/standard/tests/array/array_chunk_variation26.phpt
index 487f6b4f67..ca6975a64e 100644
--- a/ext/standard/tests/array/array_chunk_variation26.phpt
+++ b/ext/standard/tests/array/array_chunk_variation26.phpt
@@ -4,11 +4,11 @@ array_chunk() - variation 26
<?php
$array =array (0);
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";
}
?>
@@ -17,11 +17,6 @@ array(1) {
[0]=>
int(0)
}
-[0]
-NULL
-NULL
-NULL
-
[1]
array(1) {
[0]=>
diff --git a/ext/standard/tests/array/array_chunk_variation27.phpt b/ext/standard/tests/array/array_chunk_variation27.phpt
index a83a16b7fb..aa91036a52 100644
--- a/ext/standard/tests/array/array_chunk_variation27.phpt
+++ b/ext/standard/tests/array/array_chunk_variation27.phpt
@@ -4,11 +4,11 @@ array_chunk() - variation 27
<?php
$array = array (1);
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";
}
?>
@@ -17,11 +17,6 @@ array(1) {
[0]=>
int(1)
}
-[0]
-NULL
-NULL
-NULL
-
[1]
array(1) {
[0]=>
diff --git a/ext/standard/tests/array/array_chunk_variation28.phpt b/ext/standard/tests/array/array_chunk_variation28.phpt
index bdbaf45cbd..5389049ce4 100644
--- a/ext/standard/tests/array/array_chunk_variation28.phpt
+++ b/ext/standard/tests/array/array_chunk_variation28.phpt
@@ -4,11 +4,11 @@ array_chunk() - variation 28
<?php
$array = array (-1);
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";
}
?>
@@ -17,11 +17,6 @@ array(1) {
[0]=>
int(-1)
}
-[0]
-NULL
-NULL
-NULL
-
[1]
array(1) {
[0]=>
diff --git a/ext/standard/tests/array/array_chunk_variation29.phpt b/ext/standard/tests/array/array_chunk_variation29.phpt
index 12f50c1190..f18de5ea85 100644
--- a/ext/standard/tests/array/array_chunk_variation29.phpt
+++ b/ext/standard/tests/array/array_chunk_variation29.phpt
@@ -4,11 +4,11 @@ array_chunk() - variation 29
<?php
$array = array (0, 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";
}
?>
@@ -19,11 +19,6 @@ array(2) {
[1]=>
int(2)
}
-[0]
-NULL
-NULL
-NULL
-
[1]
array(2) {
[0]=>
diff --git a/ext/standard/tests/array/array_chunk_variation30.phpt b/ext/standard/tests/array/array_chunk_variation30.phpt
index 281537a876..0dbd9b6368 100644
--- a/ext/standard/tests/array/array_chunk_variation30.phpt
+++ b/ext/standard/tests/array/array_chunk_variation30.phpt
@@ -4,11 +4,11 @@ array_chunk() - variation 30
<?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";
}
?>
@@ -21,11 +21,6 @@ array(3) {
[2]=>
int(3)
}
-[0]
-NULL
-NULL
-NULL
-
[1]
array(3) {
[0]=>
diff --git a/ext/standard/tests/array/array_chunk_variation31.phpt b/ext/standard/tests/array/array_chunk_variation31.phpt
index 1592679839..fd7f358ca0 100644
--- a/ext/standard/tests/array/array_chunk_variation31.phpt
+++ b/ext/standard/tests/array/array_chunk_variation31.phpt
@@ -4,11 +4,11 @@ array_chunk() - variation 31
<?php
$array = array (1 => 0);
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";
}
?>
@@ -17,11 +17,6 @@ array(1) {
[1]=>
int(0)
}
-[0]
-NULL
-NULL
-NULL
-
[1]
array(1) {
[0]=>
diff --git a/ext/standard/tests/array/array_chunk_variation32.phpt b/ext/standard/tests/array/array_chunk_variation32.phpt
index cf65993c0b..09471a59aa 100644
--- a/ext/standard/tests/array/array_chunk_variation32.phpt
+++ b/ext/standard/tests/array/array_chunk_variation32.phpt
@@ -4,11 +4,11 @@ array_chunk() - variation 32
<?php
$array = array (2 => 1);
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";
}
?>
@@ -17,11 +17,6 @@ array(1) {
[2]=>
int(1)
}
-[0]
-NULL
-NULL
-NULL
-
[1]
array(1) {
[0]=>
diff --git a/ext/standard/tests/array/array_chunk_variation5.phpt b/ext/standard/tests/array/array_chunk_variation5.phpt
index 50050892e7..21f1a3dce2 100644
--- a/ext/standard/tests/array/array_chunk_variation5.phpt
+++ b/ext/standard/tests/array/array_chunk_variation5.phpt
@@ -26,26 +26,33 @@ $sizes = array(-1, count($input_array) + 1, 0, 1.5);
// loop through the array for size argument
foreach ($sizes as $size){
- echo "\n-- Testing array_chunk() when size = $size --\n";
- var_dump( array_chunk($input_array, $size) );
- var_dump( array_chunk($input_array, $size, true) );
- var_dump( array_chunk($input_array, $size, false) );
+ echo "\n-- Testing array_chunk() when size = $size --\n";
+ try {
+ var_dump( array_chunk($input_array, $size) );
+ } catch (\Error $e) {
+ echo $e->getMessage() . "\n";
+ }
+ try {
+ var_dump( array_chunk($input_array, $size, true) );
+ } catch (\Error $e) {
+ echo $e->getMessage() . "\n";
+ }
+ try {
+ var_dump( array_chunk($input_array, $size, false) );
+ } catch (\Error $e) {
+ echo $e->getMessage() . "\n";
+ }
}
-echo "Done";
?>
---EXPECTF--
+
+DONE
+--EXPECT--
*** Testing array_chunk() : usage variations ***
-- Testing array_chunk() when size = -1 --
-
-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
-
-Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
-NULL
+Size parameter expected to be greater than 0
+Size parameter expected to be greater than 0
+Size parameter expected to be greater than 0
-- Testing array_chunk() when size = 4 --
array(1) {
@@ -83,15 +90,9 @@ array(1) {
}
-- Testing array_chunk() when size = 0 --
-
-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
-
-Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
-NULL
+Size parameter expected to be greater than 0
+Size parameter expected to be greater than 0
+Size parameter expected to be greater than 0
-- Testing array_chunk() when size = 1.5 --
array(3) {
@@ -145,4 +146,5 @@ array(3) {
int(3)
}
}
-Done
+
+DONE
diff --git a/ext/standard/tests/array/array_chunk_variation8.phpt b/ext/standard/tests/array/array_chunk_variation8.phpt
index 6a6e752ecb..64b9bb2036 100644
--- a/ext/standard/tests/array/array_chunk_variation8.phpt
+++ b/ext/standard/tests/array/array_chunk_variation8.phpt
@@ -4,11 +4,11 @@ array_chunk() - variation 8
<?php
$array = array (3 => -1);
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";
}
?>
@@ -17,11 +17,6 @@ array(1) {
[3]=>
int(-1)
}
-[0]
-NULL
-NULL
-NULL
-
[1]
array(1) {
[0]=>
diff --git a/ext/standard/tests/array/array_chunk_variation9.phpt b/ext/standard/tests/array/array_chunk_variation9.phpt
index ec57da4f88..a68240e6f6 100644
--- a/ext/standard/tests/array/array_chunk_variation9.phpt
+++ b/ext/standard/tests/array/array_chunk_variation9.phpt
@@ -4,11 +4,11 @@ array_chunk() - variation 9
<?php
$array = array (1 => 0, 2 => 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";
}
?>
@@ -19,11 +19,6 @@ array(2) {
[2]=>
int(2)
}
-[0]
-NULL
-NULL
-NULL
-
[1]
array(2) {
[0]=>