From d762757ee5ace9d3491d8edf21bc4f310ecbbd7e Mon Sep 17 00:00:00 2001 From: Jani Taskinen Date: Mon, 1 Oct 2007 12:04:09 +0000 Subject: [PATCH] - Fixed bug #42789 (join() warning messages are not proper & different return value on php5/6) # For consistency between 5/6 also made the return value be NULL like it # has been for ages when invalid stuff is passed. --- ext/standard/string.c | 8 +- ext/standard/tests/strings/implode1.phpt | Bin 11878 -> 11900 bytes ext/standard/tests/strings/join_error.phpt | 10 +- .../tests/strings/join_variation2.phpt | 92 +++++++++--------- 4 files changed, 55 insertions(+), 55 deletions(-) diff --git a/ext/standard/string.c b/ext/standard/string.c index bf59f11386..604596ee81 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -1265,8 +1265,8 @@ 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"); - RETURN_FALSE; + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Argument must be an array"); + return; } else { SEPARATE_ZVAL(arg1); arr = *arg1; @@ -1293,8 +1293,8 @@ PHP_FUNCTION(implode) } delim = *arg1; } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad arguments"); - RETURN_FALSE; + 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 48ba05a063e4a374c88a3b63346fa3e2398e9910..faabc989176d5a498980d4d8d2afd21735d7b7b8 100644 GIT binary patch delta 415 zcmaDB^CxD5g3#oLI!dg5p*}ublf=b07YKc20*Orir648YnOByWlbNEBSd?Cxo0?Zr ztWc0xT%4LRd7+LDZpn#C;*;gXlyED+t9zl2;$(F_`^{^W%DHeG@lnSZw`8HNBW_8& ZIzQ@YY|c~4;G#kZ^y@0)b_6jY008sdonQa} delta 294 zcmewp^DJhAg3#psvS&8m5~^eZGOQ-|DT?qqC8j7O7NwWwrskCtPtI2~#t@O4%p|6S fA&RL^WAbkitIY?L^tebe{Dz|PpfG&$0VP%dv;k|v diff --git a/ext/standard/tests/strings/join_error.phpt b/ext/standard/tests/strings/join_error.phpt index 60c2de61f5..943b36ac21 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--