MFH: Fixed bug #42789

4 files changed, 27 insertions, 27 deletions

diff --git a/ext/standard/string.c b/ext/standard/string.c
index e94773c427..2ef6df6cba 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -988,7 +988,7 @@ PHP_FUNCTION(implode)
 
 	if (argc == 1) {
 		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;
 		}
 
@@ -1008,7 +1008,7 @@ PHP_FUNCTION(implode)
 			convert_to_string_ex(arg1);
 			delim = *arg1;
 		} else {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad arguments");
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid arguments passed");
 			return;
 		}
 	}
diff --git a/ext/standard/tests/strings/implode1.phpt b/ext/standard/tests/strings/implode1.phpt
index 0c64e1df2d..3a4dabbe8c 100644
--- a/ext/standard/tests/strings/implode1.phpt
+++ b/ext/standard/tests/strings/implode1.phpt
diff --git a/ext/standard/tests/strings/join_error.phpt b/ext/standard/tests/strings/join_error.phpt
index a759e1e86a..aa6bdc2306 100644
--- a/ext/standard/tests/strings/join_error.phpt
+++ b/ext/standard/tests/strings/join_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test join() function : error conditions(Bug#42789) 
+Test join() function: error conditions
 --FILE--
 <?php
 /* Prototype  : string join( string $glue, array $pieces )
@@ -45,6 +45,6 @@ NULL
 
 -- 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
 Done
diff --git a/ext/standard/tests/strings/join_variation2.phpt b/ext/standard/tests/strings/join_variation2.phpt
index 9fa03ac3e1..50395f1764 100644
--- a/ext/standard/tests/strings/join_variation2.phpt
+++ b/ext/standard/tests/strings/join_variation2.phpt
@@ -105,94 +105,94 @@ echo "Done\n";
 --- Testing join() by supplying different values for 'pieces' argument ---
 -- Iteration 1 --
 
-Warning: join(): Bad arguments in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
 NULL
 -- Iteration 2 --
 
-Warning: join(): Bad arguments in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
 NULL
 -- Iteration 3 --
 
-Warning: join(): Bad arguments in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
 NULL
 -- Iteration 4 --
 
-Warning: join(): Bad arguments in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
 NULL
 -- Iteration 5 --
 
-Warning: join(): Bad arguments in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
 NULL
 -- Iteration 6 --
 
-Warning: join(): Bad arguments in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
 NULL
 -- Iteration 7 --
 
-Warning: join(): Bad arguments in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
 NULL
 -- Iteration 8 --
 
-Warning: join(): Bad arguments in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
 NULL
 -- Iteration 9 --
 
-Warning: join(): Bad arguments in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
 NULL
 -- Iteration 10 --
 
-Warning: join(): Bad arguments in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
 NULL
 -- Iteration 11 --
 
-Warning: join(): Bad arguments in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
 NULL
 -- Iteration 12 --
 
-Warning: join(): Bad arguments in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
 NULL
 -- Iteration 13 --
 
-Warning: join(): Bad arguments in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
 NULL
 -- Iteration 14 --
 
-Warning: join(): Bad arguments in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
 NULL
 -- Iteration 15 --
 
-Warning: join(): Bad arguments in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
 NULL
 -- Iteration 16 --
 
-Warning: join(): Bad arguments in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
 NULL
 -- Iteration 17 --
 
-Warning: join(): Bad arguments in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
 NULL
 -- Iteration 18 --
 
-Warning: join(): Bad arguments in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
 NULL
 -- Iteration 19 --
 
-Warning: join(): Bad arguments in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
 NULL
 -- Iteration 20 --
 
-Warning: join(): Bad arguments in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
 NULL
 -- Iteration 21 --
 
-Warning: join(): Bad arguments in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
 NULL
 -- Iteration 22 --
 
-Warning: join(): Bad arguments in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
 NULL
 -- Iteration 23 --
 
-Warning: join(): Bad arguments in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
 NULL
 Done