clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.2'

Browse Source 
* PHP-8.2:
  Fix param name in implode() error message
This commit is contained in:
Kamil Tekiela 2023-08-24 21:07:50 +01:00
commit 649872f105
No known key found for this signature in database
GPG Key ID: 0760BDAB1E89A1E3
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/standard/string.c
View File

@ -1035,7 +1035,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();
}

6
ext/standard/tests/strings/implode1.phpt
View File

@ -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

2
ext/standard/tests/strings/join_error.phpt
View File

@ -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

8
ext/standard/tests/strings/join_variation2.phpt
View File

@ -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