Merge branch 'PHP-8.1' into PHP-8.2

* PHP-8.1:
  Fix param name in implode() error message

Author: kamil-tekiela

ext/standard/string.c

@@ -1201,7 +1201,7 @@ PHP_FUNCTION(implode)
 
 	if (pieces == NULL) {
 		if (arg1_array == NULL) {
-			zend_type_error("%s(): Argument #1 ($pieces) must be of type array, string given", get_active_function_name());
+			zend_type_error("%s(): Argument #1 ($array) must be of type array, string given", get_active_function_name());
 			RETURN_THROWS();
 		}
 

ext/standard/tests/strings/implode1.phpt

@@ -236,7 +236,7 @@ string(35) "2000-639010PHP000 0string%0with%0...%0"
 string(43) "2\00\0-639\01\0PHP\0\0\0 \0string%0with%0...%0"
 
 *** Testing implode() on empty string ***
-implode(): Argument #1 ($pieces) must be of type array, string given
+implode(): Argument #1 ($array) must be of type array, string given
 
 *** Testing implode() on sub-arrays ***
 
@@ -266,9 +266,9 @@ array(2) {
 string(%d) "Resource id #%d::Resource id #%d"
 
 *** Testing error conditions ***
-implode(): Argument #1 ($pieces) must be of type array, string given
+implode(): Argument #1 ($array) must be of type array, string given
 implode(): Argument #2 ($array) must be of type ?array, int given
-implode(): Argument #1 ($pieces) must be of type array, string given
+implode(): Argument #1 ($array) must be of type array, string given
 string(0) ""
 implode(): Argument #2 ($array) must be of type ?array, string given
 

ext/standard/tests/strings/join_error.phpt

@@ -20,5 +20,5 @@ echo "Done\n";
 *** Testing join() : error conditions ***
 
 -- Testing join() with less than expected no. of arguments --
-join(): Argument #1 ($pieces) must be of type array, string given
+join(): Argument #1 ($array) must be of type array, string given
 Done

ext/standard/tests/strings/join_variation2.phpt

@@ -138,13 +138,13 @@ join(): Argument #2 ($array) must be of type ?array, string given
 -- Iteration 18 --
 join(): Argument #2 ($array) must be of type ?array, string given
 -- Iteration 19 --
-join(): Argument #1 ($pieces) must be of type array, string given
+join(): Argument #1 ($array) must be of type array, string given
 -- Iteration 20 --
-join(): Argument #1 ($pieces) must be of type array, string given
+join(): Argument #1 ($array) must be of type array, string given
 -- Iteration 21 --
 join(): Argument #2 ($array) must be of type ?array, resource given
 -- Iteration 22 --
-join(): Argument #1 ($pieces) must be of type array, string given
+join(): Argument #1 ($array) must be of type array, string given
 -- Iteration 23 --
-join(): Argument #1 ($pieces) must be of type array, string given
+join(): Argument #1 ($array) must be of type array, string given
 Done