Merge branch 'PHP-8.5'

alexandre-daubois · alexandre-daubois · commit 1fb4e573ff15 · 2025-12-06T18:06:53.000+01:00
* PHP-8.5: Fix TypeError message of `setlocale()` (#20625)
diff --git a/ext/standard/string.c b/ext/standard/string.c
@@ -4955,7 +4955,7 @@ PHP_FUNCTION(setlocale)
 
 	for (uint32_t i = 0; i < num_args; i++) {
 		if (UNEXPECTED(Z_TYPE(args[i]) != IS_ARRAY && !zend_parse_arg_str(&args[i], &strings[i], true, i + 2))) {
-			zend_wrong_parameter_type_error(i + 2, Z_EXPECTED_ARRAY_OR_STRING, &args[i]);
+			zend_wrong_parameter_type_error(i + 2, Z_EXPECTED_ARRAY_OR_STRING_OR_NULL, &args[i]);
 			goto out;
 		}
 	}
diff --git a/ext/standard/tests/strings/gh18823_strict.phpt b/ext/standard/tests/strings/gh18823_strict.phpt
@@ -15,5 +15,5 @@ try {
 }
 ?>
 --EXPECT--
-setlocale(): Argument #2 ($locales) must be of type array|string, int given
-setlocale(): Argument #3 must be of type array|string, int given
+setlocale(): Argument #2 ($locales) must be of type array|string|null, int given
+setlocale(): Argument #3 must be of type array|string|null, int given

Original file line number	Diff line number	Diff line change
`@@ -4955,7 +4955,7 @@ PHP_FUNCTION(setlocale)`
`4955`	`4955`
`4956`	`4956`	`for (uint32_t i = 0; i < num_args; i++) {`
`4957`	`4957`	`if (UNEXPECTED(Z_TYPE(args[i]) != IS_ARRAY && !zend_parse_arg_str(&args[i], &strings[i], true, i + 2))) {`
`4958`		`- zend_wrong_parameter_type_error(i + 2, Z_EXPECTED_ARRAY_OR_STRING, &args[i]);`
	`4958`	`+ zend_wrong_parameter_type_error(i + 2, Z_EXPECTED_ARRAY_OR_STRING_OR_NULL, &args[i]);`
`4959`	`4959`	`goto out;`
`4960`	`4960`	`}`
`4961`	`4961`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,5 +15,5 @@ try {`
`15`	`15`	`}`
`16`	`16`	`?>`
`17`	`17`	`--EXPECT--`
`18`		`-setlocale(): Argument #2 ($locales) must be of type array\|string, int given`
`19`		`-setlocale(): Argument #3 must be of type array\|string, int given`
	`18`	`+setlocale(): Argument #2 ($locales) must be of type array\|string\|null, int given`
	`19`	`+setlocale(): Argument #3 must be of type array\|string\|null, int given`