archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 23:18:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

MFH: Fixed bug #42789

Browse source
This commit is contained in:
Jani Taskinen 2007-10-01 12:05:41 +00:00
parent 0625e266cd
commit b34fcd4791
4 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/standard/string.c
View file

@ -988,7 +988,7 @@ PHP_FUNCTION(implode)
if (argc == 1) { if (argc == 1) {
if (Z_TYPE_PP(arg1) != IS_ARRAY) { if (Z_TYPE_PP(arg1) != IS_ARRAY) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Argument to implode must be an array"); php_error_docref(NULL TSRMLS_CC, E_WARNING, "Argument must be an array");
return; return;
} }
@ -1008,7 +1008,7 @@ PHP_FUNCTION(implode)
convert_to_string_ex(arg1); convert_to_string_ex(arg1);
delim = *arg1; delim = *arg1;
} else { } else {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad arguments"); php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid arguments passed");
return; return;
} }
} }

BIN
ext/standard/tests/strings/implode1.phpt
View file

Binary file not shown.

4
ext/standard/tests/strings/join_error.phpt
View file

@ -1,5 +1,5 @@
--TEST-- --TEST--
Test join() function : error conditions(Bug#42789) Test join() function: error conditions
--FILE-- --FILE--
<?php <?php
/* Prototype : string join( string $glue, array $pieces ) /* Prototype : string join( string $glue, array $pieces )
@ -45,6 +45,6 @@ NULL
-- Testing join() with less than expected no. of arguments -- -- Testing join() with less than expected no. of arguments --
Warning: join(): Argument to implode must be an array in %s on line %d Warning: join(): Argument must be an array in %s on line %d
NULL NULL
Done Done

46
ext/standard/tests/strings/join_variation2.phpt
View file

@ -105,94 +105,94 @@ echo "Done\n";
--- Testing join() by supplying different values for 'pieces' argument --- --- Testing join() by supplying different values for 'pieces' argument ---
-- Iteration 1 -- -- Iteration 1 --
Warning: join(): Bad arguments in %s on line %d Warning: join(): Invalid arguments passed in %s on line %d
NULL NULL
-- Iteration 2 -- -- Iteration 2 --
Warning: join(): Bad arguments in %s on line %d Warning: join(): Invalid arguments passed in %s on line %d
NULL NULL
-- Iteration 3 -- -- Iteration 3 --
Warning: join(): Bad arguments in %s on line %d Warning: join(): Invalid arguments passed in %s on line %d
NULL NULL
-- Iteration 4 -- -- Iteration 4 --
Warning: join(): Bad arguments in %s on line %d Warning: join(): Invalid arguments passed in %s on line %d
NULL NULL
-- Iteration 5 -- -- Iteration 5 --
Warning: join(): Bad arguments in %s on line %d Warning: join(): Invalid arguments passed in %s on line %d
NULL NULL
-- Iteration 6 -- -- Iteration 6 --
Warning: join(): Bad arguments in %s on line %d Warning: join(): Invalid arguments passed in %s on line %d
NULL NULL
-- Iteration 7 -- -- Iteration 7 --
Warning: join(): Bad arguments in %s on line %d Warning: join(): Invalid arguments passed in %s on line %d
NULL NULL
-- Iteration 8 -- -- Iteration 8 --
Warning: join(): Bad arguments in %s on line %d Warning: join(): Invalid arguments passed in %s on line %d
NULL NULL
-- Iteration 9 -- -- Iteration 9 --
Warning: join(): Bad arguments in %s on line %d Warning: join(): Invalid arguments passed in %s on line %d
NULL NULL
-- Iteration 10 -- -- Iteration 10 --
Warning: join(): Bad arguments in %s on line %d Warning: join(): Invalid arguments passed in %s on line %d
NULL NULL
-- Iteration 11 -- -- Iteration 11 --
Warning: join(): Bad arguments in %s on line %d Warning: join(): Invalid arguments passed in %s on line %d
NULL NULL
-- Iteration 12 -- -- Iteration 12 --
Warning: join(): Bad arguments in %s on line %d Warning: join(): Invalid arguments passed in %s on line %d
NULL NULL
-- Iteration 13 -- -- Iteration 13 --
Warning: join(): Bad arguments in %s on line %d Warning: join(): Invalid arguments passed in %s on line %d
NULL NULL
-- Iteration 14 -- -- Iteration 14 --
Warning: join(): Bad arguments in %s on line %d Warning: join(): Invalid arguments passed in %s on line %d
NULL NULL
-- Iteration 15 -- -- Iteration 15 --
Warning: join(): Bad arguments in %s on line %d Warning: join(): Invalid arguments passed in %s on line %d
NULL NULL
-- Iteration 16 -- -- Iteration 16 --
Warning: join(): Bad arguments in %s on line %d Warning: join(): Invalid arguments passed in %s on line %d
NULL NULL
-- Iteration 17 -- -- Iteration 17 --
Warning: join(): Bad arguments in %s on line %d Warning: join(): Invalid arguments passed in %s on line %d
NULL NULL
-- Iteration 18 -- -- Iteration 18 --
Warning: join(): Bad arguments in %s on line %d Warning: join(): Invalid arguments passed in %s on line %d
NULL NULL
-- Iteration 19 -- -- Iteration 19 --
Warning: join(): Bad arguments in %s on line %d Warning: join(): Invalid arguments passed in %s on line %d
NULL NULL
-- Iteration 20 -- -- Iteration 20 --
Warning: join(): Bad arguments in %s on line %d Warning: join(): Invalid arguments passed in %s on line %d
NULL NULL
-- Iteration 21 -- -- Iteration 21 --
Warning: join(): Bad arguments in %s on line %d Warning: join(): Invalid arguments passed in %s on line %d
NULL NULL
-- Iteration 22 -- -- Iteration 22 --
Warning: join(): Bad arguments in %s on line %d Warning: join(): Invalid arguments passed in %s on line %d
NULL NULL
-- Iteration 23 -- -- Iteration 23 --
Warning: join(): Bad arguments in %s on line %d Warning: join(): Invalid arguments passed in %s on line %d
NULL NULL
Done Done