Promote warning to error in array_chunk()

diff --git a/ext/standard/array.c b/ext/standard/array.c
index b99d3222dc1de28d21c85f52f3e3c69f858bc837..678f32708c6834278d977cab109118de8a64d1e0 100644 (file)
--- 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 (file)
index 2ee77e1..0000000
--- 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 6d8b74545e4834d1929701dc080a06a20036541e..c02194aa5b998ba06313ba9add8b5181b251dbb5 100644 (file)
--- 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 7b4bee172beb2b8ac2eacbf35949805df9f0851e..be5fcdc7f30a7427dc3d8333dad3a7a1c9047eb2 100644 (file)
--- 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 dca366652d9193123090f2fba9c5089ec1539ea6..09ec255744252a8383778971fcb0bc7db349b890 100644 (file)
--- 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 3b87dbab950289e2daa9d5c5da19623a256295c1..f85f2a8c0dc59442376ca0455edfb13f6ef07839 100644 (file)
--- 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 f6369df1c8a1dd5ff16b2da1954bbb2f640bb775..5cd6f0ea34fae4ed3379c85262ebdb588f03a952 100644 (file)
--- 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 f8d1b11790f1726a702eb303fc6e0c4b4cb41600..97fce1e7224e370f327741b418eefb822265a1be 100644 (file)
--- 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 abec754a3d3afdd87a4b996477213f4403729f76..c48af63f6ced623c2cf771ebe5b89ba4fb27f570 100644 (file)
--- 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 18179c8b07b924414a51a7f8af5bdee60e92f64f..3426f9278bfcb52db5cfba8ae5a87020ad8af738 100644 (file)
--- 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 27507ea8cd5e44bac376d5ee5a40f871d3d1750f..1a8bb5d34014a21e894233e0cbed250aa8f875b0 100644 (file)
--- 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 7f0946f4977ee92d20127f11ffa04a94a7da1564..593c702ce94d1b2d7c2a59b25e6b8465b8a82278 100644 (file)
--- 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 d51389c9f3b6ae54b524b6a1da6ed54a3ffebec2..f160cba2631f75cfe642e57ac2e56a56c603e1a4 100644 (file)
--- 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 cd5314ff04c3cea87735ea6129b09bf7ba73e734..d47279915c9fa8836fc1ad9bb958a52643686e2e 100644 (file)
--- 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 678bf16751c0fda58144ae238b9fa00beb4015cc..e8c7784325a4eaf295a6b649ed99c68ba5de5159 100644 (file)
--- 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 45c458ebf95e397a10a22c0a36a932d5342ad03d..b0eeade3ab00bcccbcfca92dd76dd43dd07c4fe2 100644 (file)
--- 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 80b92985b15f397b478e1ad1641c7ecf18044644..87ced15132074b6462c3a04b11a627f95236363d 100644 (file)
--- 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 e25f53f6b65641eab6a17e0403fd5c19e8d1dcab..69dce7be174650212bf0d679dd62ad867ff9e9c7 100644 (file)
--- 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 eae89e952b1154fa14c095681e1104450bf288db..09303c30ba758255ff120c052a6cacca83c6cf01 100644 (file)
--- 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 487f6b4f67622d9607e8d058da193f719dbb8e48..ca6975a64e9c6ba599add56780514b59fc68dbce 100644 (file)
--- 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 a83a16b7fbdde6a0d97df4320653c695343bba16..aa91036a5206424ce25ed4f20da01531e11b7392 100644 (file)
--- 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 bdbaf45cbd52d6ec3789d99ea489c2e3684bb7d7..5389049ce40ad56131eb2ae432c86b8918315db6 100644 (file)
--- 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 12f50c11906b21436dd1b219f6ea3ea9356dfbb3..f18de5ea8577c6a7e63dc28a998a0bfdf0c5b1e1 100644 (file)
--- 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 281537a8760694ef591340fc85adc3c6848f95f8..0dbd9b63683fbce51f5afec06bd730885de7d078 100644 (file)
--- 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 1592679839d5eed57127af687cf94d7dd17bb333..fd7f358ca0ddb0f5d1fb7b5b2326d31d484b03fc 100644 (file)
--- 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 cf65993c0b692a229b3e65c57845ef79a4a5e2db..09471a59aaf43009c28f332338f19621fe0b853b 100644 (file)
--- 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 50050892e7067503aa20b602f40082a8c4b2219f..21f1a3dce286afd1a499c442e310de3991814e1f 100644 (file)
--- 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 6a6e752ecb9ed8cce4fd57c85f62ae229fad757a..64b9bb20361774d6cb7328feb3668b546eb74ec0 100644 (file)
--- 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 ec57da4f88c070679a10a901192f14cacc826085..a68240e6f6425bc1b744b705529062d18d671492 100644 (file)
--- 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]=>