jani Mon Oct 1 12:04:09 2007 UTC
Modified files:
/php-src/ext/standard string.c
/php-src/ext/standard/tests/strings implode1.phpt join_error.phpt
join_variation2.phpt
Log:
- 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.
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.651&r2=1.652&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.651 php-src/ext/standard/string.c:1.652
--- php-src/ext/standard/string.c:1.651 Fri Sep 7 02:28:26 2007
+++ php-src/ext/standard/string.c Mon Oct 1 12:04:09 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.651 2007/09/07 02:28:26 iliaa Exp $ */
+/* $Id: string.c,v 1.652 2007/10/01 12:04:09 jani Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -1265,8 +1265,8 @@
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 @@
}
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;
}
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/implode1.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/standard/tests/strings/implode1.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/join_error.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/strings/join_error.phpt
diff -u php-src/ext/standard/tests/strings/join_error.phpt:1.1
php-src/ext/standard/tests/strings/join_error.phpt:1.2
--- php-src/ext/standard/tests/strings/join_error.phpt:1.1 Sat Sep 29
09:08:24 2007
+++ php-src/ext/standard/tests/strings/join_error.phpt Mon Oct 1 12:04:09 2007
@@ -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,8 +45,8 @@
-- Testing join() with less than expected no. of arguments --
-Warning: join(): Argument to join must be an array in %s on line %d
-bool(false)
+Warning: join(): Argument must be an array in %s on line %d
+NULL
Done
--UEXPECTF--
*** Testing join() : error conditions ***
@@ -63,6 +63,6 @@
-- Testing join() with less than expected no. of arguments --
-Warning: join(): Argument to join must be an array in %s on line %d
-bool(false)
+Warning: join(): Argument must be an array in %s on line %d
+NULL
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/join_variation2.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/strings/join_variation2.phpt
diff -u php-src/ext/standard/tests/strings/join_variation2.phpt:1.1
php-src/ext/standard/tests/strings/join_variation2.phpt:1.2
--- php-src/ext/standard/tests/strings/join_variation2.phpt:1.1 Sat Sep 29
09:08:24 2007
+++ php-src/ext/standard/tests/strings/join_variation2.phpt Mon Oct 1
12:04:09 2007
@@ -102,95 +102,95 @@
--- 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
--UEXPECTF--
@@ -199,94 +199,94 @@
--- 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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
