Using the new error message always with null

Author: CViniciusSDias

ext/standard/string.c

@@ -1030,7 +1030,7 @@ PHP_FUNCTION(implode)
 	ZEND_PARSE_PARAMETERS_START(1, 2)
 		Z_PARAM_ARRAY_HT_OR_STR(arg1_array, arg1_str)
 		Z_PARAM_OPTIONAL
-		Z_PARAM_ARRAY_HT(pieces)
+		Z_PARAM_ARRAY_HT_OR_NULL(pieces)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (arg1_str != NULL && pieces == NULL) {

ext/standard/tests/strings/implode_error.phpt

@@ -1,4 +1,5 @@
 --TEST--
+Test implode() function: error conditions
 --FILE--
 <?php
 /* only glue */
@@ -23,5 +24,5 @@ try {
 }
 --EXPECTF--
 implode(): If argument #1 ($separator) is of type string, argument #2 ($array) must be of type array, null given
-implode(): Argument #2 ($array) must be of type array, null given
-implode(): Argument #2 ($array) must be of type array, string given
+implode(): If argument #1 ($separator) is of type string, argument #2 ($array) must be of type array, null given
+implode(): Argument #2 ($array) must be of type ?array, string given

ext/standard/tests/strings/join_error1.phpt

@@ -102,49 +102,49 @@ echo "Done\n";
 
 --- Testing join() by supplying different values for 'pieces' argument ---
 -- Iteration 1 --
-join(): Argument #2 ($array) must be of type array, int given
+join(): Argument #2 ($array) must be of type ?array, int given
 -- Iteration 2 --
-join(): Argument #2 ($array) must be of type array, int given
+join(): Argument #2 ($array) must be of type ?array, int given
 -- Iteration 3 --
-join(): Argument #2 ($array) must be of type array, int given
+join(): Argument #2 ($array) must be of type ?array, int given
 -- Iteration 4 --
-join(): Argument #2 ($array) must be of type array, int given
+join(): Argument #2 ($array) must be of type ?array, int given
 -- Iteration 5 --
-join(): Argument #2 ($array) must be of type array, float given
+join(): Argument #2 ($array) must be of type ?array, float given
 -- Iteration 6 --
-join(): Argument #2 ($array) must be of type array, float given
+join(): Argument #2 ($array) must be of type ?array, float given
 -- Iteration 7 --
-join(): Argument #2 ($array) must be of type array, float given
+join(): Argument #2 ($array) must be of type ?array, float given
 -- Iteration 8 --
-join(): Argument #2 ($array) must be of type array, float given
+join(): Argument #2 ($array) must be of type ?array, float given
 -- Iteration 9 --
-join(): Argument #2 ($array) must be of type array, float given
+join(): Argument #2 ($array) must be of type ?array, float given
 -- Iteration 10 --
-join(): Argument #2 ($array) must be of type array, true given
+join(): Argument #2 ($array) must be of type ?array, true given
 -- Iteration 11 --
-join(): Argument #2 ($array) must be of type array, false given
+join(): Argument #2 ($array) must be of type ?array, false given
 -- Iteration 12 --
-join(): Argument #2 ($array) must be of type array, true given
+join(): Argument #2 ($array) must be of type ?array, true given
 -- Iteration 13 --
-join(): Argument #2 ($array) must be of type array, false given
+join(): Argument #2 ($array) must be of type ?array, false given
 -- Iteration 14 --
-join(): Argument #2 ($array) must be of type array, string given
+join(): Argument #2 ($array) must be of type ?array, string given
 -- Iteration 15 --
-join(): Argument #2 ($array) must be of type array, string given
+join(): Argument #2 ($array) must be of type ?array, string given
 -- Iteration 16 --
-join(): Argument #2 ($array) must be of type array, test given
+join(): Argument #2 ($array) must be of type ?array, test given
 -- Iteration 17 --
-join(): Argument #2 ($array) must be of type array, string given
+join(): Argument #2 ($array) must be of type ?array, string given
 -- Iteration 18 --
-join(): Argument #2 ($array) must be of type array, string given
+join(): Argument #2 ($array) must be of type ?array, string given
 -- Iteration 19 --
-join(): Argument #2 ($array) must be of type array, null given
+join(): If argument #1 ($separator) is of type string, argument #2 ($array) must be of type array, null given
 -- Iteration 20 --
-join(): Argument #2 ($array) must be of type array, null given
+join(): If argument #1 ($separator) is of type string, argument #2 ($array) must be of type array, null given
 -- Iteration 21 --
-join(): Argument #2 ($array) must be of type array, resource given
+join(): Argument #2 ($array) must be of type ?array, resource given
 -- Iteration 22 --
-join(): Argument #2 ($array) must be of type array, null given
+join(): If argument #1 ($separator) is of type string, argument #2 ($array) must be of type array, null given
 -- Iteration 23 --
-join(): Argument #2 ($array) must be of type array, null given
+join(): If argument #1 ($separator) is of type string, argument #2 ($array) must be of type array, null given
 Done