cvs: php-src(PHP_5_2) /ext/standard array.c basic_functions.c browscap.c exec.c filters.c formatted_print.c ftp_fopen_wrapper.c http.c
http_fopen_wrapper.c image.c mail.c php_fopen_wrapper.c streamsfuncs.c string.c uniqid.c url.c uuencode.c var.c /ext/standard/tests/general_functions
import_request.phpt /ext/standard/tests/strings bug40754.phpt chunk_split_variation2.phpt chunk_split_variation5.phpt chunk_split_variation8.phpt
explode1.phpt implode1.phpt join_error.phpt join_variation2.phpt str_pad.phpt str_repeat.phpt stripos_variation1.phpt stripos_variation10.phpt
stripos_variation11.phpt stripos_variation14.phpt stripos_variation15.phpt stripos_variation2.phpt stripos_variation7.phpt stristr.phpt strpos.phpt
strstr.phpt substr_count_error.phpt uuencode.phpt

jani Thu Oct 4 13:31:12 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard array.c basic_functions.c browscap.c exec.c filters.c formatted_print.c ftp_fopen_wrapper.c http.c http_fopen_wrapper.c image.c mail.c php_fopen_wrapper.c streamsfuncs.c string.c uniqid.c url.c uuencode.c var.c /php-src/ext/standard/tests/general_functions import_request.phpt /php-src/ext/standard/tests/strings bug40754.phpt chunk_split_variation2.phpt chunk_split_variation5.phpt chunk_split_variation8.phpt explode1.phpt implode1.phpt join_error.phpt join_variation2.phpt str_pad.phpt str_repeat.phpt stripos_variation1.phpt stripos_variation10.phpt stripos_variation11.phpt stripos_variation14.phpt stripos_variation15.phpt stripos_variation2.phpt stripos_variation7.phpt stristr.phpt strpos.phpt strstr.phpt substr_count_error.phpt uuencode.phpt Log: MFH: Removed ending dots from error messages

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.38&r2=1.308.2.21.2.39&diff_format=u Index: php-src/ext/standard/array.c diff -u php-src/ext/standard/array.c:1.308.2.21.2.38 php-src/ext/standard/array.c:1.308.2.21.2.39 --- php-src/ext/standard/array.c:1.308.2.21.2.38 Tue Oct 2 10:04:13 2007 +++ php-src/ext/standard/array.c Thu Oct 4 13:31:10 2007 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: array.c,v 1.308.2.21.2.38 2007/10/02 10:04:13 tony2001 Exp $ */ +/* $Id: array.c,v 1.308.2.21.2.39 2007/10/04 13:31:10 jani Exp $ */ #include "php.h" #include "php_ini.h" @@ -618,7 +618,7 @@ /* check if comparison function is valid */ #define PHP_ARRAY_CMP_FUNC_CHECK(func_name) \ if (!zend_is_callable(*func_name, 0, NULL)) { \ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid comparison function."); \ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid comparison function"); \ BG(user_compare_fci_cache) = old_user_compare_fci_cache; \ BG(user_compare_func_name) = old_compare_func; \ RETURN_FALSE; \ @@ -3159,7 +3159,7 @@ BG(user_compare_func_name) = args[arr_argc + 1];/* data - key */ } else { efree(args); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "data_compare_type is %d. key_compare_type is %d. This should never happen. Please report as a bug.", data_compare_type, key_compare_type); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "data_compare_type is %d. key_compare_type is %d. This should never happen. Please report as a bug", data_compare_type, key_compare_type); return; } } else { http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.64&r2=1.725.2.31.2.65&diff_format=u Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.64 php-src/ext/standard/basic_functions.c:1.725.2.31.2.65 --- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64 Thu Sep 6 13:28:05 2007 +++ php-src/ext/standard/basic_functions.c Thu Oct 4 13:31:10 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.725.2.31.2.64 2007/09/06 13:28:05 derick Exp $ */ +/* $Id: basic_functions.c,v 1.725.2.31.2.65 2007/10/04 13:31:10 jani Exp $ */ #include "php.h" #include "php_streams.h" @@ -4496,7 +4496,7 @@ } } - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid parameter syntax."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid parameter syntax"); RETURN_FALSE; } /* }}} */ @@ -4810,7 +4810,7 @@ c_ts = (double)(d_ts - tm.tv_sec - tm.tv_usec / 1000000.00); if (c_ts < 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sleep until to time is less than current time."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sleep until to time is less than current time"); RETURN_FALSE; } @@ -6273,7 +6273,7 @@ prefix_len = va_arg(args, uint); if (!prefix_len && !hash_key->nKeyLength) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Numeric key detected - possible security hazard."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Numeric key detected - possible security hazard"); return 0; } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/browscap.c?r1=1.85.2.2.2.3&r2=1.85.2.2.2.4&diff_format=u Index: php-src/ext/standard/browscap.c diff -u php-src/ext/standard/browscap.c:1.85.2.2.2.3 php-src/ext/standard/browscap.c:1.85.2.2.2.4 --- php-src/ext/standard/browscap.c:1.85.2.2.2.3 Wed Mar 7 00:52:40 2007 +++ php-src/ext/standard/browscap.c Thu Oct 4 13:31:10 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: browscap.c,v 1.85.2.2.2.3 2007/03/07 00:52:40 iliaa Exp $ */ +/* $Id: browscap.c,v 1.85.2.2.2.4 2007/10/04 13:31:10 jani Exp $ */ #include "php.h" #include "php_regex.h" @@ -290,7 +290,7 @@ char *browscap = INI_STR("browscap"); if (!browscap || !browscap[0]) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "browscap ini directive not set."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "browscap ini directive not set"); RETURN_FALSE; } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/exec.c?r1=1.113.2.3.2.1&r2=1.113.2.3.2.2&diff_format=u Index: php-src/ext/standard/exec.c diff -u php-src/ext/standard/exec.c:1.113.2.3.2.1 php-src/ext/standard/exec.c:1.113.2.3.2.2 --- php-src/ext/standard/exec.c:1.113.2.3.2.1 Mon Jan 1 09:36:08 2007 +++ php-src/ext/standard/exec.c Thu Oct 4 13:31:11 2007 @@ -16,7 +16,7 @@ | Ilia Alshanetsky <iliaa@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: exec.c,v 1.113.2.3.2.1 2007/01/01 09:36:08 sebastian Exp $ */ +/* $Id: exec.c,v 1.113.2.3.2.2 2007/10/04 13:31:11 jani Exp $ */ #include <stdio.h> #include "php.h" @@ -463,7 +463,7 @@ errno = 0; nice(pri); if (errno) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Only a super user may attempt to increase the priority of a process."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Only a super user may attempt to increase the priority of a process"); RETURN_FALSE; } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/filters.c?r1=1.44.2.6.2.4&r2=1.44.2.6.2.5&diff_format=u Index: php-src/ext/standard/filters.c diff -u php-src/ext/standard/filters.c:1.44.2.6.2.4 php-src/ext/standard/filters.c:1.44.2.6.2.5 --- php-src/ext/standard/filters.c:1.44.2.6.2.4 Mon Jan 1 09:36:08 2007 +++ php-src/ext/standard/filters.c Thu Oct 4 13:31:11 2007 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: filters.c,v 1.44.2.6.2.4 2007/01/01 09:36:08 sebastian Exp $ */ +/* $Id: filters.c,v 1.44.2.6.2.5 2007/10/04 13:31:11 jani Exp $ */ #include "php.h" #include "php_globals.h" @@ -1880,7 +1880,7 @@ /* Create this filter */ data = pecalloc(1, sizeof(php_consumed_filter_data), persistent); if (!data) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %zd bytes.", sizeof(php_consumed_filter_data)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %zd bytes", sizeof(php_consumed_filter_data)); return NULL; } data->persistent = persistent; http://cvs.php.net/viewvc.cgi/php-src/ext/standard/formatted_print.c?r1=1.82.2.1.2.16&r2=1.82.2.1.2.17&diff_format=u Index: php-src/ext/standard/formatted_print.c diff -u php-src/ext/standard/formatted_print.c:1.82.2.1.2.16 php-src/ext/standard/formatted_print.c:1.82.2.1.2.17 --- php-src/ext/standard/formatted_print.c:1.82.2.1.2.16 Sun Jun 3 09:12:04 2007 +++ php-src/ext/standard/formatted_print.c Thu Oct 4 13:31:11 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: formatted_print.c,v 1.82.2.1.2.16 2007/06/03 09:12:04 shire Exp $ */ +/* $Id: formatted_print.c,v 1.82.2.1.2.17 2007/10/04 13:31:11 jani Exp $ */ #include <math.h> /* modf() */ #include "php.h" @@ -445,7 +445,7 @@ if (argnum <= 0) { efree(result); efree(args); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Argument number must be greater than zero."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Argument number must be greater than zero"); return NULL; } @@ -487,7 +487,7 @@ if ((width = php_sprintf_getnumber(format, &inpos)) < 0) { efree(result); efree(args); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Width must be greater than zero and less than %d.", INT_MAX); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Width must be greater than zero and less than %d", INT_MAX); return NULL; } adjusting |= ADJ_WIDTH; @@ -504,7 +504,7 @@ if ((precision = php_sprintf_getnumber(format, &inpos)) < 0) { efree(result); efree(args); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Precision must be greater than zero and less than %d.", INT_MAX); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Precision must be greater than zero and less than %d", INT_MAX); return NULL; } adjusting |= ADJ_PRECISION; http://cvs.php.net/viewvc.cgi/php-src/ext/standard/ftp_fopen_wrapper.c?r1=1.85.2.4.2.5&r2=1.85.2.4.2.6&diff_format=u Index: php-src/ext/standard/ftp_fopen_wrapper.c diff -u php-src/ext/standard/ftp_fopen_wrapper.c:1.85.2.4.2.5 php-src/ext/standard/ftp_fopen_wrapper.c:1.85.2.4.2.6 --- php-src/ext/standard/ftp_fopen_wrapper.c:1.85.2.4.2.5 Thu Sep 27 13:15:09 2007 +++ php-src/ext/standard/ftp_fopen_wrapper.c Thu Oct 4 13:31:11 2007 @@ -18,7 +18,7 @@ | Sara Golemon <pollita@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: ftp_fopen_wrapper.c,v 1.85.2.4.2.5 2007/09/27 13:15:09 jani Exp $ */ +/* $Id: ftp_fopen_wrapper.c,v 1.85.2.4.2.6 2007/10/04 13:31:11 jani Exp $ */ #include "php.h" #include "php_globals.h" @@ -412,7 +412,7 @@ } if (strpbrk(mode, "wa+")) { if (read_write) { - php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "FTP does not support simultaneous read/write connections."); + php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "FTP does not support simultaneous read/write connections"); return NULL; } if (strchr(mode, 'a')) { @@ -423,7 +423,7 @@ } if (!read_write) { /* No mode specified? */ - php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "Unknown file open mode."); + php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "Unknown file open mode"); return NULL; } @@ -486,7 +486,7 @@ goto errexit; } } else { - php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "Remote file already exists and overwrite context option not specified."); + php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "Remote file already exists and overwrite context option not specified"); errno = EEXIST; goto errexit; } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/http.c?r1=1.14.2.4.2.3&r2=1.14.2.4.2.4&diff_format=u Index: php-src/ext/standard/http.c diff -u php-src/ext/standard/http.c:1.14.2.4.2.3 php-src/ext/standard/http.c:1.14.2.4.2.4 --- php-src/ext/standard/http.c:1.14.2.4.2.3 Wed Jan 3 23:16:56 2007 +++ php-src/ext/standard/http.c Thu Oct 4 13:31:11 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: http.c,v 1.14.2.4.2.3 2007/01/03 23:16:56 iliaa Exp $ */ +/* $Id: http.c,v 1.14.2.4.2.4 2007/10/04 13:31:11 jani Exp $ */ #include "php_http.h" #include "php_ini.h" @@ -76,7 +76,7 @@ } if (zend_hash_get_current_data_ex(ht, (void **)&zdata, NULL) == FAILURE || !zdata || !(*zdata)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error traversing form data array."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error traversing form data array"); return FAILURE; } if (Z_TYPE_PP(zdata) == IS_ARRAY || Z_TYPE_PP(zdata) == IS_OBJECT) { @@ -203,7 +203,7 @@ } if (Z_TYPE_P(formdata) != IS_ARRAY && Z_TYPE_P(formdata) != IS_OBJECT) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Parameter 1 expected to be Array or Object. Incorrect value given."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Parameter 1 expected to be Array or Object. Incorrect value given"); RETURN_FALSE; } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/http_fopen_wrapper.c?r1=1.99.2.12.2.9&r2=1.99.2.12.2.10&diff_format=u Index: php-src/ext/standard/http_fopen_wrapper.c diff -u php-src/ext/standard/http_fopen_wrapper.c:1.99.2.12.2.9 php-src/ext/standard/http_fopen_wrapper.c:1.99.2.12.2.10 --- php-src/ext/standard/http_fopen_wrapper.c:1.99.2.12.2.9 Mon Apr 23 16:37:28 2007 +++ php-src/ext/standard/http_fopen_wrapper.c Thu Oct 4 13:31:11 2007 @@ -19,7 +19,7 @@ | Sara Golemon <pollita@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: http_fopen_wrapper.c,v 1.99.2.12.2.9 2007/04/23 16:37:28 bjori Exp $ */ +/* $Id: http_fopen_wrapper.c,v 1.99.2.12.2.10 2007/10/04 13:31:11 jani Exp $ */ #include "php.h" #include "php_globals.h" @@ -137,7 +137,7 @@ /* Normal http request (possibly with proxy) */ if (strpbrk(mode, "awx+")) { - php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "HTTP wrapper does not support writeable connections."); + php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "HTTP wrapper does not support writeable connections"); php_url_free(resource); return NULL; } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/image.c?r1=1.114.2.2.2.5&r2=1.114.2.2.2.6&diff_format=u Index: php-src/ext/standard/image.c diff -u php-src/ext/standard/image.c:1.114.2.2.2.5 php-src/ext/standard/image.c:1.114.2.2.2.6 --- php-src/ext/standard/image.c:1.114.2.2.2.5 Tue May 8 18:38:20 2007 +++ php-src/ext/standard/image.c Thu Oct 4 13:31:11 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: image.c,v 1.114.2.2.2.5 2007/05/08 18:38:20 iliaa Exp $ */ +/* $Id: image.c,v 1.114.2.2.2.6 2007/10/04 13:31:11 jani Exp $ */ #include "php.h" #include <stdio.h> @@ -1317,8 +1317,7 @@ #if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) result = php_handle_swc(stream TSRMLS_CC); #else - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "The image is a compressed SWF file, but you do not have a static version of the zlib extension enabled."); - + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "The image is a compressed SWF file, but you do not have a static version of the zlib extension enabled"); #endif break; case IMAGE_FILETYPE_PSD: http://cvs.php.net/viewvc.cgi/php-src/ext/standard/mail.c?r1=1.87.2.1.2.7&r2=1.87.2.1.2.8&diff_format=u Index: php-src/ext/standard/mail.c diff -u php-src/ext/standard/mail.c:1.87.2.1.2.7 php-src/ext/standard/mail.c:1.87.2.1.2.8 --- php-src/ext/standard/mail.c:1.87.2.1.2.7 Wed Jul 11 17:36:56 2007 +++ php-src/ext/standard/mail.c Thu Oct 4 13:31:11 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mail.c,v 1.87.2.1.2.7 2007/07/11 17:36:56 johannes Exp $ */ +/* $Id: mail.c,v 1.87.2.1.2.8 2007/10/04 13:31:11 jani Exp $ */ #include <stdlib.h> #include <ctype.h> @@ -98,7 +98,7 @@ char *p, *e; if (PG(safe_mode) && (ZEND_NUM_ARGS() == 5)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "SAFE MODE Restriction in effect. The fifth parameter is disabled in SAFE MODE."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "SAFE MODE Restriction in effect. The fifth parameter is disabled in SAFE MODE"); RETURN_FALSE; } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/php_fopen_wrapper.c?r1=1.45.2.4.2.7&r2=1.45.2.4.2.8&diff_format=u Index: php-src/ext/standard/php_fopen_wrapper.c diff -u php-src/ext/standard/php_fopen_wrapper.c:1.45.2.4.2.7 php-src/ext/standard/php_fopen_wrapper.c:1.45.2.4.2.8 --- php-src/ext/standard/php_fopen_wrapper.c:1.45.2.4.2.7 Thu Jun 21 12:42:36 2007 +++ php-src/ext/standard/php_fopen_wrapper.c Thu Oct 4 13:31:11 2007 @@ -17,7 +17,7 @@ | Hartmut Holzgraefe <hholzgra@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: php_fopen_wrapper.c,v 1.45.2.4.2.7 2007/06/21 12:42:36 dmitry Exp $ */ +/* $Id: php_fopen_wrapper.c,v 1.45.2.4.2.8 2007/10/04 13:31:11 jani Exp $ */ #include <stdio.h> #include <stdlib.h> @@ -253,7 +253,7 @@ pathdup = estrndup(path + 6, strlen(path + 6)); p = strstr(pathdup, "/resource="); if (!p) { - php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR, "No URL resource specified."); + php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR, "No URL resource specified"); efree(pathdup); return NULL; } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.58.2.6.2.15&r2=1.58.2.6.2.16&diff_format=u Index: php-src/ext/standard/streamsfuncs.c diff -u php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15 php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.16 --- php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15 Mon Jul 9 17:27:24 2007 +++ php-src/ext/standard/streamsfuncs.c Thu Oct 4 13:31:11 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: streamsfuncs.c,v 1.58.2.6.2.15 2007/07/09 17:27:24 dmitry Exp $ */ +/* $Id: streamsfuncs.c,v 1.58.2.6.2.16 2007/10/04 13:31:11 jani Exp $ */ #include "php.h" #include "php_globals.h" @@ -357,7 +357,7 @@ } if (to_read <= 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Length parameter must be greater than 0."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Length parameter must be greater than 0"); RETURN_FALSE; } @@ -406,7 +406,7 @@ php_stream_from_zval(stream, &zsrc); if (pos > 0 && php_stream_seek(stream, pos, SEEK_SET) < 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to seek to position %ld in the stream.", pos); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to seek to position %ld in the stream", pos); RETURN_FALSE; } @@ -442,7 +442,7 @@ php_stream_from_zval(dest, &zdest); if (pos > 0 && php_stream_seek(src, pos, SEEK_SET) < 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to seek to position %ld in the stream.", pos); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to seek to position %ld in the stream", pos); RETURN_FALSE; } @@ -757,10 +757,10 @@ convert_to_long_ex(sec); if (Z_LVAL_PP(sec) < 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "The seconds parameter must be greater than 0."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "The seconds parameter must be greater than 0"); RETURN_FALSE; } else if (usec < 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "The microseconds parameter must be greater than 0."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "The microseconds parameter must be greater than 0"); RETURN_FALSE; } @@ -945,7 +945,7 @@ } context = decode_context_param(zcontext TSRMLS_CC); if (!context) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid stream/context parameter."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid stream/context parameter"); RETURN_FALSE; } @@ -975,7 +975,7 @@ /* figure out where the context is coming from exactly */ context = decode_context_param(zcontext TSRMLS_CC); if (!context) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid stream/context parameter."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid stream/context parameter"); RETURN_FALSE; } @@ -1002,7 +1002,7 @@ context = decode_context_param(zcontext TSRMLS_CC); if (!context) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid stream/context parameter."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid stream/context parameter"); RETURN_FALSE; } @@ -1186,7 +1186,7 @@ } if (max_length < 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "The maximum allowed length must be greater than or equal to zero."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "The maximum allowed length must be greater than or equal to zero"); RETURN_FALSE; } if (!max_length) { http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.69&r2=1.445.2.14.2.70&diff_format=u Index: php-src/ext/standard/string.c diff -u php-src/ext/standard/string.c:1.445.2.14.2.69 php-src/ext/standard/string.c:1.445.2.14.2.70 --- php-src/ext/standard/string.c:1.445.2.14.2.69 Fri Sep 7 18:23:58 2007 +++ php-src/ext/standard/string.c Thu Oct 4 13:31:11 2007 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: string.c,v 1.445.2.14.2.69 2007/09/07 18:23:58 pajoye Exp $ */ +/* $Id: string.c,v 1.445.2.14.2.70 2007/10/04 13:31:11 jani Exp $ */ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ @@ -511,22 +511,22 @@ /* Error, try to be as helpful as possible: (a range ending/starting with '.' won't be captured here) */ if (end-len >= input) { /* there was no 'left' char */ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid '..'-range, no character to the left of '..'."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid '..'-range, no character to the left of '..'"); result = FAILURE; continue; } if (input+2 >= end) { /* there is no 'right' char */ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid '..'-range, no character to the right of '..'."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid '..'-range, no character to the right of '..'"); result = FAILURE; continue; } if (input[-1] > input[2]) { /* wrong order */ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid '..'-range, '..'-range needs to be incrementing."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid '..'-range, '..'-range needs to be incrementing"); result = FAILURE; continue; } /* FIXME: better error (a..b..c is the only left possibility?) */ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid '..'-range."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid '..'-range"); result = FAILURE; continue; } else { @@ -861,7 +861,7 @@ } if (! Z_STRLEN_PP(delim)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty delimiter."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty delimiter"); RETURN_FALSE; } @@ -988,7 +988,7 @@ 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 @@ 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; } } @@ -1544,7 +1544,7 @@ if (Z_TYPE_PP(needle) == IS_STRING) { if (!Z_STRLEN_PP(needle)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty delimiter."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty delimiter"); efree(haystack_orig); RETURN_FALSE; } @@ -1592,7 +1592,7 @@ if (Z_TYPE_PP(needle) == IS_STRING) { if (!Z_STRLEN_PP(needle)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty delimiter."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty delimiter"); RETURN_FALSE; } @@ -1645,13 +1645,13 @@ } if (offset < 0 || offset > Z_STRLEN_PP(haystack)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset not contained in string."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset not contained in string"); RETURN_FALSE; } if (Z_TYPE_PP(needle) == IS_STRING) { if (!Z_STRLEN_PP(needle)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty delimiter."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty delimiter"); RETURN_FALSE; } @@ -1695,7 +1695,7 @@ } if (offset < 0 || offset > haystack_len) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset not contained in string."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset not contained in string"); RETURN_FALSE; } @@ -1725,7 +1725,7 @@ needle_char[0] = tolower((char) Z_DVAL_P(needle)); break; default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "needle is not a string or an integer."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "needle is not a string or an integer"); efree(haystack_dup); RETURN_FALSE; break; @@ -2038,7 +2038,7 @@ } if (chunklen <= 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Chunk length should be greater than zero."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Chunk length should be greater than zero"); RETURN_FALSE; } @@ -2181,8 +2181,7 @@ if (Z_TYPE_PP(str) == IS_STRING) { if ( - (argc == 3 && Z_TYPE_PP(from) == IS_ARRAY) - || + (argc == 3 && Z_TYPE_PP(from) == IS_ARRAY) || (argc == 4 && Z_TYPE_PP(from) != Z_TYPE_PP(len)) ) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "'from' and 'len' should be of same type - numerical or array "); @@ -2195,7 +2194,6 @@ } } } - if (Z_TYPE_PP(str) != IS_ARRAY) { if (Z_TYPE_PP(from) != IS_ARRAY) { @@ -2253,7 +2251,7 @@ result[result_len] = '\0'; RETURN_STRINGL(result, result_len, 0); } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Functionality of 'from' and 'len' as arrays is not implemented."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Functionality of 'from' and 'len' as arrays is not implemented"); RETURN_STRINGL(Z_STRVAL_PP(str), Z_STRLEN_PP(str), 1); } } else { /* str is array of strings */ @@ -2646,7 +2644,7 @@ } if (ac == 2 && Z_TYPE_PP(from) != IS_ARRAY) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "The second argument is not an array."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "The second argument is not an array"); RETURN_FALSE; } @@ -3951,7 +3949,7 @@ cat = Z_LVAL_PP(pcategory); } else { /* FIXME: The following behaviour should be removed. */ char *category; - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Passing locale category name as string is deprecated. Use the LC_* -constants instead."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Passing locale category name as string is deprecated. Use the LC_* -constants instead"); convert_to_string_ex(pcategory); category = Z_STRVAL_P(*pcategory); @@ -3972,7 +3970,7 @@ else if (!strcasecmp ("LC_TIME", category)) cat = LC_TIME; else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid locale category name %s, must be one of LC_ALL, LC_COLLATE, LC_CTYPE, LC_MONETARY, LC_NUMERIC, or LC_TIME.", category); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid locale category name %s, must be one of LC_ALL, LC_COLLATE, LC_CTYPE, LC_MONETARY, LC_NUMERIC, or LC_TIME", category); efree(args); RETURN_FALSE; } @@ -4411,7 +4409,7 @@ convert_to_long_ex(mult); if (Z_LVAL_PP(mult) < 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Second argument has to be greater than or equal to 0."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Second argument has to be greater than or equal to 0"); return; } @@ -4475,7 +4473,7 @@ mymode = Z_LVAL_PP(mode); if (mymode < 0 || mymode > 4) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown mode."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown mode"); RETURN_FALSE; } } @@ -4666,7 +4664,7 @@ convert_to_string_ex(needle); if (Z_STRLEN_PP(needle) == 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty substring."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty substring"); RETURN_FALSE; } @@ -4676,12 +4674,12 @@ if (ac > 2) { convert_to_long_ex(offset); if (Z_LVAL_PP(offset) < 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset should be greater than or equal to 0."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset should be greater than or equal to 0"); RETURN_FALSE; } if (Z_LVAL_PP(offset) > Z_STRLEN_PP(haystack)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset value %ld exceeds string length.", Z_LVAL_PP(offset)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset value %ld exceeds string length", Z_LVAL_PP(offset)); RETURN_FALSE; } p += Z_LVAL_PP(offset); @@ -4689,11 +4687,11 @@ if (ac == 4) { convert_to_long_ex(length); if (Z_LVAL_PP(length) <= 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Length should be greater than 0."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Length should be greater than 0"); RETURN_FALSE; } if (Z_LVAL_PP(length) > (Z_STRLEN_PP(haystack) - Z_LVAL_PP(offset))) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Length value %ld exceeds string length.", Z_LVAL_PP(length)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Length value %ld exceeds string length", Z_LVAL_PP(length)); RETURN_FALSE; } endp = p + Z_LVAL_PP(length); @@ -4759,7 +4757,7 @@ if (ZEND_NUM_ARGS() > 2) { convert_to_string_ex(pad_string); if (Z_STRLEN_PP(pad_string) == 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Padding string cannot be empty."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Padding string cannot be empty"); return; } pad_str_val = Z_STRVAL_PP(pad_string); @@ -4769,7 +4767,7 @@ convert_to_long_ex(pad_type); pad_type_val = Z_LVAL_PP(pad_type); if (pad_type_val < STR_PAD_LEFT || pad_type_val > STR_PAD_BOTH) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Padding type has to be STR_PAD_LEFT, STR_PAD_RIGHT, or STR_PAD_BOTH."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Padding type has to be STR_PAD_LEFT, STR_PAD_RIGHT, or STR_PAD_BOTH"); return; } } @@ -5053,7 +5051,7 @@ } if (split_length <= 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "The length of each segment must be greater than zero."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "The length of each segment must be greater than zero"); RETURN_FALSE; } @@ -5091,7 +5089,7 @@ } if (!char_list_len) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "The character list cannot be empty."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "The character list cannot be empty"); RETURN_FALSE; } @@ -5127,12 +5125,12 @@ offset = (offset < 0) ? 0 : offset; } - if(offset > s1_len) { + if (offset > s1_len) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "The start position cannot exceed initial string length"); RETURN_FALSE; } - if(len > s1_len - offset) { + if (len > s1_len - offset) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "The length cannot exceed initial string length"); RETURN_FALSE; } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/uniqid.c?r1=1.41.2.2.2.2&r2=1.41.2.2.2.3&diff_format=u Index: php-src/ext/standard/uniqid.c diff -u php-src/ext/standard/uniqid.c:1.41.2.2.2.2 php-src/ext/standard/uniqid.c:1.41.2.2.2.3 --- php-src/ext/standard/uniqid.c:1.41.2.2.2.2 Fri Jan 5 15:06:55 2007 +++ php-src/ext/standard/uniqid.c Thu Oct 4 13:31:11 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: uniqid.c,v 1.41.2.2.2.2 2007/01/05 15:06:55 iliaa Exp $ */ +/* $Id: uniqid.c,v 1.41.2.2.2.3 2007/10/04 13:31:11 jani Exp $ */ #include "php.h" @@ -61,7 +61,7 @@ #if HAVE_USLEEP && !defined(PHP_WIN32) if (!more_entropy) { #if defined(__CYGWIN__) - php_error_docref(NULL TSRMLS_CC, E_WARNING, "You must use 'more entropy' under CYGWIN."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "You must use 'more entropy' under CYGWIN"); RETURN_FALSE; #else usleep(1); http://cvs.php.net/viewvc.cgi/php-src/ext/standard/url.c?r1=1.86.2.5.2.7&r2=1.86.2.5.2.8&diff_format=u Index: php-src/ext/standard/url.c diff -u php-src/ext/standard/url.c:1.86.2.5.2.7 php-src/ext/standard/url.c:1.86.2.5.2.8 --- php-src/ext/standard/url.c:1.86.2.5.2.7 Mon Jan 1 09:36:09 2007 +++ php-src/ext/standard/url.c Thu Oct 4 13:31:11 2007 @@ -15,7 +15,7 @@ | Author: Jim Winstead <jimw@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: url.c,v 1.86.2.5.2.7 2007/01/01 09:36:09 sebastian Exp $ */ +/* $Id: url.c,v 1.86.2.5.2.8 2007/10/04 13:31:11 jani Exp $ */ #include <stdlib.h> #include <string.h> @@ -375,7 +375,7 @@ if (resource->fragment != NULL) RETVAL_STRING(resource->fragment, 1); break; default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid URL component identifier %ld.", key); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid URL component identifier %ld", key); RETVAL_FALSE; } goto done; http://cvs.php.net/viewvc.cgi/php-src/ext/standard/uuencode.c?r1=1.5.2.1.2.4&r2=1.5.2.1.2.5&diff_format=u Index: php-src/ext/standard/uuencode.c diff -u php-src/ext/standard/uuencode.c:1.5.2.1.2.4 php-src/ext/standard/uuencode.c:1.5.2.1.2.5 --- php-src/ext/standard/uuencode.c:1.5.2.1.2.4 Mon Mar 12 20:55:15 2007 +++ php-src/ext/standard/uuencode.c Thu Oct 4 13:31:11 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: uuencode.c,v 1.5.2.1.2.4 2007/03/12 20:55:15 tony2001 Exp $ */ +/* $Id: uuencode.c,v 1.5.2.1.2.5 2007/10/04 13:31:11 jani Exp $ */ /* * Portions of this code are based on Berkeley's uuencode/uudecode @@ -215,7 +215,7 @@ dst_len = php_uudecode(src, src_len, &dst); if (dst_len < 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "The given parameter is not a valid uuencoded string."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "The given parameter is not a valid uuencoded string"); RETURN_FALSE; } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var.c?r1=1.203.2.7.2.18&r2=1.203.2.7.2.19&diff_format=u Index: php-src/ext/standard/var.c diff -u php-src/ext/standard/var.c:1.203.2.7.2.18 php-src/ext/standard/var.c:1.203.2.7.2.19 --- php-src/ext/standard/var.c:1.203.2.7.2.18 Tue Jun 26 11:51:14 2007 +++ php-src/ext/standard/var.c Thu Oct 4 13:31:11 2007 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: var.c,v 1.203.2.7.2.18 2007/06/26 11:51:14 tony2001 Exp $ */ +/* $Id: var.c,v 1.203.2.7.2.19 2007/10/04 13:31:11 jani Exp $ */ @@ -589,7 +589,7 @@ if (Z_TYPE_PP(name) != IS_STRING) { php_error_docref(NULL TSRMLS_CC, E_NOTICE, "__sleep should return an array only " "containing the names of instance-variables to " - "serialize."); + "serialize"); /* we should still add element even if it's not OK, since we already wrote the length of the array before */ smart_str_appendl(buf,"N;", 2); @@ -742,7 +742,7 @@ } else { php_error_docref(NULL TSRMLS_CC, E_NOTICE, "__sleep should return an array only " "containing the names of instance-variables to " - "serialize."); + "serialize"); /* we should still add element even if it's not OK, since we already wrote the length of the array before */ smart_str_appendl(buf,"N;", 2); http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/import_request.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u Index: php-src/ext/standard/tests/general_functions/import_request.phpt diff -u php-src/ext/standard/tests/general_functions/import_request.phpt:1.1.2.3 php-src/ext/standard/tests/general_functions/import_request.phpt:1.1.2.4 --- php-src/ext/standard/tests/general_functions/import_request.phpt:1.1.2.3 Tue May 22 16:52:58 2007 +++ php-src/ext/standard/tests/general_functions/import_request.phpt Thu Oct 4 13:31:11 2007 @@ -39,7 +39,7 @@ Warning: import_request_variables(): Attempted GLOBALS variable overwrite in %s on line %d -Warning: import_request_variables(): Numeric key detected - possible security hazard. in %s on line %d +Warning: import_request_variables(): Numeric key detected - possible security hazard in %s on line %d NULL Notice: Undefined variable: ap in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug40754.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u Index: php-src/ext/standard/tests/strings/bug40754.phpt diff -u php-src/ext/standard/tests/strings/bug40754.phpt:1.1.2.3 php-src/ext/standard/tests/strings/bug40754.phpt:1.1.2.4 --- php-src/ext/standard/tests/strings/bug40754.phpt:1.1.2.3 Tue Jul 31 07:09:08 2007 +++ php-src/ext/standard/tests/strings/bug40754.phpt Thu Oct 4 13:31:11 2007 @@ -32,25 +32,25 @@ bool(false) bool(false) -Warning: substr_count(): Offset value 2147483647 exceeds string length. in %s on line %d +Warning: substr_count(): Offset value 2147483647 exceeds string length in %s on line %d bool(false) Warning: substr_compare(): The start position cannot exceed initial string length in %s on line %d bool(false) -Warning: stripos(): Offset not contained in string. in %s on line %d +Warning: stripos(): Offset not contained in string in %s on line %d bool(false) -Warning: substr_count(): Offset value 2147483647 exceeds string length. in %s on line %d +Warning: substr_count(): Offset value 2147483647 exceeds string length in %s on line %d bool(false) -Warning: substr_count(): Length value 2147483647 exceeds string length. in %s on line %d +Warning: substr_count(): Length value 2147483647 exceeds string length in %s on line %d bool(false) -Warning: strpos(): Offset not contained in string. in %s on line %d +Warning: strpos(): Offset not contained in string in %s on line %d bool(false) -Warning: stripos(): Offset not contained in string. in %s on line %d +Warning: stripos(): Offset not contained in string in %s on line %d bool(false) Notice: strrpos(): Offset is greater than the length of haystack string in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/chunk_split_variation2.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/standard/tests/strings/chunk_split_variation2.phpt diff -u php-src/ext/standard/tests/strings/chunk_split_variation2.phpt:1.1.2.2 php-src/ext/standard/tests/strings/chunk_split_variation2.phpt:1.1.2.3 --- php-src/ext/standard/tests/strings/chunk_split_variation2.phpt:1.1.2.2 Mon Oct 1 10:22:43 2007 +++ php-src/ext/standard/tests/strings/chunk_split_variation2.phpt Thu Oct 4 13:31:11 2007 @@ -95,21 +95,21 @@ string(28) "This is ch*uklen vari*ation*" -- Iteration 2 -- -Warning: chunk_split(): Chunk length should be greater than zero. in %s on line %d +Warning: chunk_split(): Chunk length should be greater than zero in %s on line %d bool(false) -- Iteration 3 -- string(26) "This is chuklen variation*" -- Iteration 4 -- -Warning: chunk_split(): Chunk length should be greater than zero. in %s on line %d +Warning: chunk_split(): Chunk length should be greater than zero in %s on line %d bool(false) -- Iteration 5 -- -Warning: chunk_split(): Chunk length should be greater than zero. in %s on line %d +Warning: chunk_split(): Chunk length should be greater than zero in %s on line %d bool(false) -- Iteration 6 -- -Warning: chunk_split(): Chunk length should be greater than zero. in %s on line %d +Warning: chunk_split(): Chunk length should be greater than zero in %s on line %d bool(false) -- Iteration 7 -- string(50) "T*h*i*s* *i*s* *c*h*u*k*l*e*n* *v*a*r*i*a*t*i*o*n*" @@ -121,39 +121,39 @@ string(50) "T*h*i*s* *i*s* *c*h*u*k*l*e*n* *v*a*r*i*a*t*i*o*n*" -- Iteration 11 -- -Warning: chunk_split(): Chunk length should be greater than zero. in %s on line %d +Warning: chunk_split(): Chunk length should be greater than zero in %s on line %d bool(false) -- Iteration 12 -- -Warning: chunk_split(): Chunk length should be greater than zero. in %s on line %d +Warning: chunk_split(): Chunk length should be greater than zero in %s on line %d bool(false) -- Iteration 13 -- string(50) "T*h*i*s* *i*s* *c*h*u*k*l*e*n* *v*a*r*i*a*t*i*o*n*" -- Iteration 14 -- -Warning: chunk_split(): Chunk length should be greater than zero. in %s on line %d +Warning: chunk_split(): Chunk length should be greater than zero in %s on line %d bool(false) -- Iteration 15 -- string(50) "T*h*i*s* *i*s* *c*h*u*k*l*e*n* *v*a*r*i*a*t*i*o*n*" -- Iteration 16 -- -Warning: chunk_split(): Chunk length should be greater than zero. in %s on line %d +Warning: chunk_split(): Chunk length should be greater than zero in %s on line %d bool(false) -- Iteration 17 -- -Warning: chunk_split(): Chunk length should be greater than zero. in %s on line %d +Warning: chunk_split(): Chunk length should be greater than zero in %s on line %d bool(false) -- Iteration 18 -- -Warning: chunk_split(): Chunk length should be greater than zero. in %s on line %d +Warning: chunk_split(): Chunk length should be greater than zero in %s on line %d bool(false) -- Iteration 19 -- -Warning: chunk_split(): Chunk length should be greater than zero. in %s on line %d +Warning: chunk_split(): Chunk length should be greater than zero in %s on line %d bool(false) -- Iteration 20 -- -Warning: chunk_split(): Chunk length should be greater than zero. in %s on line %d +Warning: chunk_split(): Chunk length should be greater than zero in %s on line %d bool(false) -- Iteration 21 -- @@ -161,11 +161,11 @@ string(50) "T*h*i*s* *i*s* *c*h*u*k*l*e*n* *v*a*r*i*a*t*i*o*n*" -- Iteration 22 -- -Warning: chunk_split(): Chunk length should be greater than zero. in %s on line %d +Warning: chunk_split(): Chunk length should be greater than zero in %s on line %d bool(false) -- Iteration 23 -- -Warning: chunk_split(): Chunk length should be greater than zero. in %s on line %d +Warning: chunk_split(): Chunk length should be greater than zero in %s on line %d bool(false) -- Iteration 24 -- string(30) "This *is ch*uklen* vari*ation*" http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/chunk_split_variation5.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/standard/tests/strings/chunk_split_variation5.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/chunk_split_variation8.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/standard/tests/strings/chunk_split_variation8.phpt diff -u php-src/ext/standard/tests/strings/chunk_split_variation8.phpt:1.1.2.2 php-src/ext/standard/tests/strings/chunk_split_variation8.phpt:1.1.2.3 --- php-src/ext/standard/tests/strings/chunk_split_variation8.phpt:1.1.2.2 Mon Oct 1 10:22:43 2007 +++ php-src/ext/standard/tests/strings/chunk_split_variation8.phpt Thu Oct 4 13:31:11 2007 @@ -51,7 +51,7 @@ *** Testing chunk_split() : different 'chunklen' with heredoc 'str' *** -- Iteration 1 -- -Warning: chunk_split(): Chunk length should be greater than zero. in %s on line %d +Warning: chunk_split(): Chunk length should be greater than zero in %s on line %d bool(false) -- Iteration 2 -- string(504) "T:::h:::i:::s:::':::s::: :::h:::e:::r:::e:::d:::o:::c::: :::s:::t:::r:::i:::n:::g::: :::w:::i:::t:::h::: ::: ::: :::a:::n:::d::: ::: @@ -60,7 +60,7 @@ :::c:::h:::u:::n:::k:::_:::s:::p:::l:::i:::t:::(:::):::" -- Iteration 3 -- -Warning: chunk_split(): Chunk length should be greater than zero. in %s on line %d +Warning: chunk_split(): Chunk length should be greater than zero in %s on line %d bool(false) -- Iteration 4 -- string(129) "This's heredoc string with and @@ -79,10 +79,10 @@ chunk_split():::" -- Iteration 7 -- -Warning: chunk_split(): Chunk length should be greater than zero. in %s on line %d +Warning: chunk_split(): Chunk length should be greater than zero in %s on line %d bool(false) -- Iteration 8 -- -Warning: chunk_split(): Chunk length should be greater than zero. in %s on line %d +Warning: chunk_split(): Chunk length should be greater than zero in %s on line %d bool(false) Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/explode1.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/standard/tests/strings/explode1.phpt diff -u php-src/ext/standard/tests/strings/explode1.phpt:1.1.2.2 php-src/ext/standard/tests/strings/explode1.phpt:1.1.2.3 --- php-src/ext/standard/tests/strings/explode1.phpt:1.1.2.2 Tue May 29 10:25:33 2007 +++ php-src/ext/standard/tests/strings/explode1.phpt Thu Oct 4 13:31:11 2007 @@ -88,29 +88,29 @@ *** Testing explode() for basic operations *** -- Iteration 1 -- -Warning: explode(): Empty delimiter. in %s on line %d +Warning: explode(): Empty delimiter in %s on line %d bool(false) -Warning: explode(): Empty delimiter. in %s on line %d +Warning: explode(): Empty delimiter in %s on line %d bool(false) -Warning: explode(): Empty delimiter. in %s on line %d +Warning: explode(): Empty delimiter in %s on line %d bool(false) -Warning: explode(): Empty delimiter. in %s on line %d +Warning: explode(): Empty delimiter in %s on line %d bool(false) -- Iteration 2 -- -Warning: explode(): Empty delimiter. in %s on line %d +Warning: explode(): Empty delimiter in %s on line %d bool(false) -Warning: explode(): Empty delimiter. in %s on line %d +Warning: explode(): Empty delimiter in %s on line %d bool(false) -Warning: explode(): Empty delimiter. in %s on line %d +Warning: explode(): Empty delimiter in %s on line %d bool(false) -Warning: explode(): Empty delimiter. in %s on line %d +Warning: explode(): Empty delimiter in %s on line %d bool(false) -- Iteration 3 -- array(1) { @@ -214,16 +214,16 @@ } -- Iteration 7 -- -Warning: explode(): Empty delimiter. in %s on line %d +Warning: explode(): Empty delimiter in %s on line %d bool(false) -Warning: explode(): Empty delimiter. in %s on line %d +Warning: explode(): Empty delimiter in %s on line %d bool(false) -Warning: explode(): Empty delimiter. in %s on line %d +Warning: explode(): Empty delimiter in %s on line %d bool(false) -Warning: explode(): Empty delimiter. in %s on line %d +Warning: explode(): Empty delimiter in %s on line %d bool(false) -- Iteration 8 -- array(2) { http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/implode1.phpt?r1=1.1.2.4&r2=1.1.2.5&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.2.3&r2=1.1.2.4&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.2.3 php-src/ext/standard/tests/strings/join_error.phpt:1.1.2.4 --- php-src/ext/standard/tests/strings/join_error.phpt:1.1.2.3 Mon Oct 1 10:25:50 2007 +++ php-src/ext/standard/tests/strings/join_error.phpt Thu Oct 4 13:31:11 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,6 +45,6 @@ -- 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 http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/join_variation2.phpt?r1=1.1.2.3&r2=1.1.2.4&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.2.3 php-src/ext/standard/tests/strings/join_variation2.phpt:1.1.2.4 --- php-src/ext/standard/tests/strings/join_variation2.phpt:1.1.2.3 Mon Oct 1 10:41:36 2007 +++ php-src/ext/standard/tests/strings/join_variation2.phpt Thu Oct 4 13:31:11 2007 @@ -105,94 +105,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 http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/str_pad.phpt?r1=1.1.2.6&r2=1.1.2.7&diff_format=u Index: php-src/ext/standard/tests/strings/str_pad.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/str_repeat.phpt?r1=1.2.6.2&r2=1.2.6.3&diff_format=u Index: php-src/ext/standard/tests/strings/str_repeat.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/stripos_variation1.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/standard/tests/strings/stripos_variation1.phpt diff -u php-src/ext/standard/tests/strings/stripos_variation1.phpt:1.1.2.1 php-src/ext/standard/tests/strings/stripos_variation1.phpt:1.1.2.2 --- php-src/ext/standard/tests/strings/stripos_variation1.phpt:1.1.2.1 Sat Sep 29 09:19:43 2007 +++ php-src/ext/standard/tests/strings/stripos_variation1.phpt Thu Oct 4 13:31:11 2007 @@ -118,17 +118,17 @@ bool(false) -- Iteration 12 -- -Warning: stripos(): needle is not a string or an integer. in %s on line %d +Warning: stripos(): needle is not a string or an integer in %s on line %d bool(false) -Warning: stripos(): needle is not a string or an integer. in %s on line %d +Warning: stripos(): needle is not a string or an integer in %s on line %d bool(false) -- Iteration 13 -- -Warning: stripos(): needle is not a string or an integer. in %s on line %d +Warning: stripos(): needle is not a string or an integer in %s on line %d bool(false) -Warning: stripos(): needle is not a string or an integer. in %s on line %d +Warning: stripos(): needle is not a string or an integer in %s on line %d bool(false) -- Iteration 14 -- int(8) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/stripos_variation10.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/standard/tests/strings/stripos_variation10.phpt diff -u php-src/ext/standard/tests/strings/stripos_variation10.phpt:1.1.2.1 php-src/ext/standard/tests/strings/stripos_variation10.phpt:1.1.2.2 --- php-src/ext/standard/tests/strings/stripos_variation10.phpt:1.1.2.1 Sat Sep 29 09:19:43 2007 +++ php-src/ext/standard/tests/strings/stripos_variation10.phpt Thu Oct 4 13:31:11 2007 @@ -123,27 +123,27 @@ -- Iteration 10 -- -Warning: stripos(): needle is not a string or an integer. in %s on line %d +Warning: stripos(): needle is not a string or an integer in %s on line %d bool(false) -- Iteration 11 -- -Warning: stripos(): needle is not a string or an integer. in %s on line %d +Warning: stripos(): needle is not a string or an integer in %s on line %d bool(false) -- Iteration 12 -- -Warning: stripos(): needle is not a string or an integer. in %s on line %d +Warning: stripos(): needle is not a string or an integer in %s on line %d bool(false) -- Iteration 13 -- -Warning: stripos(): needle is not a string or an integer. in %s on line %d +Warning: stripos(): needle is not a string or an integer in %s on line %d bool(false) -- Iteration 14 -- -Warning: stripos(): needle is not a string or an integer. in %s on line %d +Warning: stripos(): needle is not a string or an integer in %s on line %d bool(false) -- Iteration 15 -- @@ -160,7 +160,7 @@ -- Iteration 19 -- -Warning: stripos(): needle is not a string or an integer. in %s on line %d +Warning: stripos(): needle is not a string or an integer in %s on line %d bool(false) -- Iteration 20 -- @@ -171,26 +171,26 @@ -- Iteration 22 -- -Warning: stripos(): needle is not a string or an integer. in %s on line %d +Warning: stripos(): needle is not a string or an integer in %s on line %d bool(false) -- Iteration 23 -- -Warning: stripos(): needle is not a string or an integer. in %s on line %d +Warning: stripos(): needle is not a string or an integer in %s on line %d bool(false) -- Iteration 24 -- -Warning: stripos(): needle is not a string or an integer. in %s on line %d +Warning: stripos(): needle is not a string or an integer in %s on line %d bool(false) -- Iteration 25 -- -Warning: stripos(): needle is not a string or an integer. in %s on line %d +Warning: stripos(): needle is not a string or an integer in %s on line %d bool(false) -- Iteration 26 -- -Warning: stripos(): needle is not a string or an integer. in %s on line %d +Warning: stripos(): needle is not a string or an integer in %s on line %d bool(false) *** Done *** http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/stripos_variation11.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/standard/tests/strings/stripos_variation11.phpt diff -u php-src/ext/standard/tests/strings/stripos_variation11.phpt:1.1.2.1 php-src/ext/standard/tests/strings/stripos_variation11.phpt:1.1.2.2 --- php-src/ext/standard/tests/strings/stripos_variation11.phpt:1.1.2.1 Sat Sep 29 09:19:43 2007 +++ php-src/ext/standard/tests/strings/stripos_variation11.phpt Thu Oct 4 13:31:11 2007 @@ -158,7 +158,7 @@ -- Iteration 16 -- bool(false) -Warning: stripos(): Offset not contained in string. in %s on line %d +Warning: stripos(): Offset not contained in string in %s on line %d bool(false) -- Iteration 17 -- bool(false) @@ -166,34 +166,34 @@ -- Iteration 18 -- bool(false) -Warning: stripos(): Offset not contained in string. in %s on line %d +Warning: stripos(): Offset not contained in string in %s on line %d bool(false) -- Iteration 19 -- -Warning: stripos(): needle is not a string or an integer. in %s on line %d +Warning: stripos(): needle is not a string or an integer in %s on line %d bool(false) -Warning: stripos(): needle is not a string or an integer. in %s on line %d +Warning: stripos(): needle is not a string or an integer in %s on line %d bool(false) -- Iteration 20 -- bool(false) -Warning: stripos(): Offset not contained in string. in %s on line %d +Warning: stripos(): Offset not contained in string in %s on line %d bool(false) -- Iteration 21 -- bool(false) -Warning: stripos(): Offset not contained in string. in %s on line %d +Warning: stripos(): Offset not contained in string in %s on line %d bool(false) -- Iteration 22 -- bool(false) -Warning: stripos(): Offset not contained in string. in %s on line %d +Warning: stripos(): Offset not contained in string in %s on line %d bool(false) -- Iteration 23 -- bool(false) -Warning: stripos(): Offset not contained in string. in %s on line %d +Warning: stripos(): Offset not contained in string in %s on line %d bool(false) -- Iteration 24 -- @@ -205,11 +205,11 @@ -- Iteration 25 -- bool(false) -Warning: stripos(): Offset not contained in string. in %s on line %d +Warning: stripos(): Offset not contained in string in %s on line %d bool(false) -- Iteration 26 -- bool(false) -Warning: stripos(): Offset not contained in string. in %s on line %d +Warning: stripos(): Offset not contained in string in %s on line %d bool(false) *** Done *** http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/stripos_variation14.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/standard/tests/strings/stripos_variation14.phpt diff -u php-src/ext/standard/tests/strings/stripos_variation14.phpt:1.1.2.1 php-src/ext/standard/tests/strings/stripos_variation14.phpt:1.1.2.2 --- php-src/ext/standard/tests/strings/stripos_variation14.phpt:1.1.2.1 Sat Sep 29 09:19:43 2007 +++ php-src/ext/standard/tests/strings/stripos_variation14.phpt Thu Oct 4 13:31:11 2007 @@ -90,11 +90,11 @@ int(6) -- Iteration 2 -- -Warning: stripos(): Offset not contained in string. in %s on line %d +Warning: stripos(): Offset not contained in string in %s on line %d bool(false) -- Iteration 3 -- -Warning: stripos(): Offset not contained in string. in %s on line %d +Warning: stripos(): Offset not contained in string in %s on line %d bool(false) -- Iteration 4 -- int(6) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/stripos_variation15.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/standard/tests/strings/stripos_variation15.phpt diff -u php-src/ext/standard/tests/strings/stripos_variation15.phpt:1.1.2.1 php-src/ext/standard/tests/strings/stripos_variation15.phpt:1.1.2.2 --- php-src/ext/standard/tests/strings/stripos_variation15.phpt:1.1.2.1 Sat Sep 29 09:19:43 2007 +++ php-src/ext/standard/tests/strings/stripos_variation15.phpt Thu Oct 4 13:31:11 2007 @@ -94,23 +94,23 @@ bool(false) -- Iteration 3 -- -Warning: stripos(): Offset not contained in string. in %s on line %d +Warning: stripos(): Offset not contained in string in %s on line %d bool(false) -- Iteration 4 -- -Warning: stripos(): Offset not contained in string. in %s on line %d +Warning: stripos(): Offset not contained in string in %s on line %d bool(false) -- Iteration 5 -- -Warning: stripos(): Offset not contained in string. in %s on line %d +Warning: stripos(): Offset not contained in string in %s on line %d bool(false) -- Iteration 6 -- -Warning: stripos(): Offset not contained in string. in %s on line %d +Warning: stripos(): Offset not contained in string in %s on line %d bool(false) -- Iteration 7 -- -Warning: stripos(): Offset not contained in string. in %s on line %d +Warning: stripos(): Offset not contained in string in %s on line %d bool(false) -- Iteration 8 -- bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/stripos_variation2.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/standard/tests/strings/stripos_variation2.phpt diff -u php-src/ext/standard/tests/strings/stripos_variation2.phpt:1.1.2.1 php-src/ext/standard/tests/strings/stripos_variation2.phpt:1.1.2.2 --- php-src/ext/standard/tests/strings/stripos_variation2.phpt:1.1.2.1 Sat Sep 29 09:19:43 2007 +++ php-src/ext/standard/tests/strings/stripos_variation2.phpt Thu Oct 4 13:31:11 2007 @@ -120,17 +120,17 @@ int(10) -- Iteration 12 -- -Warning: stripos(): needle is not a string or an integer. in %s on line %d +Warning: stripos(): needle is not a string or an integer in %s on line %d bool(false) -Warning: stripos(): needle is not a string or an integer. in %s on line %d +Warning: stripos(): needle is not a string or an integer in %s on line %d bool(false) -- Iteration 13 -- -Warning: stripos(): needle is not a string or an integer. in %s on line %d +Warning: stripos(): needle is not a string or an integer in %s on line %d bool(false) -Warning: stripos(): needle is not a string or an integer. in %s on line %d +Warning: stripos(): needle is not a string or an integer in %s on line %d bool(false) -- Iteration 14 -- bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/stripos_variation7.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/standard/tests/strings/stripos_variation7.phpt diff -u php-src/ext/standard/tests/strings/stripos_variation7.phpt:1.1.2.1 php-src/ext/standard/tests/strings/stripos_variation7.phpt:1.1.2.2 --- php-src/ext/standard/tests/strings/stripos_variation7.phpt:1.1.2.1 Sat Sep 29 09:19:43 2007 +++ php-src/ext/standard/tests/strings/stripos_variation7.phpt Thu Oct 4 13:31:11 2007 @@ -27,7 +27,7 @@ -- With empty heredoc string -- bool(false) -Warning: stripos(): Offset not contained in string. in %s on line %d +Warning: stripos(): Offset not contained in string in %s on line %d bool(false) bool(false) bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/stristr.phpt?r1=1.3.2.2&r2=1.3.2.3&diff_format=u Index: php-src/ext/standard/tests/strings/stristr.phpt diff -u php-src/ext/standard/tests/strings/stristr.phpt:1.3.2.2 php-src/ext/standard/tests/strings/stristr.phpt:1.3.2.3 --- php-src/ext/standard/tests/strings/stristr.phpt:1.3.2.2 Mon Nov 20 20:55:51 2006 +++ php-src/ext/standard/tests/strings/stristr.phpt Thu Oct 4 13:31:11 2007 @@ -24,7 +24,7 @@ Notice: Array to string conversion in %s on line %d -Warning: stristr(): Empty delimiter. in %s on line %d +Warning: stristr(): Empty delimiter in %s on line %d bool(false) bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strpos.phpt?r1=1.2.6.2&r2=1.2.6.3&diff_format=u Index: php-src/ext/standard/tests/strings/strpos.phpt diff -u php-src/ext/standard/tests/strings/strpos.phpt:1.2.6.2 php-src/ext/standard/tests/strings/strpos.phpt:1.2.6.3 --- php-src/ext/standard/tests/strings/strpos.phpt:1.2.6.2 Fri May 18 11:29:55 2007 +++ php-src/ext/standard/tests/strings/strpos.phpt Thu Oct 4 13:31:11 2007 @@ -301,7 +301,7 @@ Notice: Undefined variable: needleS in %s on line %d -Warning: strpos(): Empty delimiter. in %s on line %d +Warning: strpos(): Empty delimiter in %s on line %d bool(false) int(7) int(7) @@ -313,7 +313,7 @@ *** Testing error conditions *** -Warning: strpos(): Empty delimiter. in %s on line %d +Warning: strpos(): Empty delimiter in %s on line %d bool(false) Warning: Wrong parameter count for strpos() in %s on line %d @@ -328,13 +328,13 @@ Warning: Wrong parameter count for strpos() in %s on line %d NULL -Warning: strpos(): Offset not contained in string. in %s on line %d +Warning: strpos(): Offset not contained in string in %s on line %d bool(false) -Warning: strpos(): Offset not contained in string. in %s on line %d +Warning: strpos(): Offset not contained in string in %s on line %d bool(false) -Warning: strpos(): Empty delimiter. in %s on line %d +Warning: strpos(): Empty delimiter in %s on line %d bool(false) Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strstr.phpt?r1=1.2.6.1&r2=1.2.6.2&diff_format=u Index: php-src/ext/standard/tests/strings/strstr.phpt diff -u php-src/ext/standard/tests/strings/strstr.phpt:1.2.6.1 php-src/ext/standard/tests/strings/strstr.phpt:1.2.6.2 --- php-src/ext/standard/tests/strings/strstr.phpt:1.2.6.1 Sat May 12 10:15:02 2007 +++ php-src/ext/standard/tests/strings/strstr.phpt Thu Oct 4 13:31:11 2007 @@ -379,7 +379,7 @@ Notice: Undefined variable: needleS in %s on line %d -Warning: strstr(): Empty delimiter. in %s on line %d +Warning: strstr(): Empty delimiter in %s on line %d bool(false) string(6) "worldS" string(6) "worldS" @@ -391,7 +391,7 @@ *** Testing error conditions *** -Warning: strstr(): Empty delimiter. in %s on line %d +Warning: strstr(): Empty delimiter in %s on line %d bool(false) Warning: Wrong parameter count for strstr() in %s on line %d @@ -406,7 +406,7 @@ Warning: Wrong parameter count for strstr() in %s on line %d NULL -Warning: strstr(): Empty delimiter. in %s on line %d +Warning: strstr(): Empty delimiter in %s on line %d bool(false) Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/substr_count_error.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/standard/tests/strings/substr_count_error.phpt diff -u php-src/ext/standard/tests/strings/substr_count_error.phpt:1.1.2.2 php-src/ext/standard/tests/strings/substr_count_error.phpt:1.1.2.3 --- php-src/ext/standard/tests/strings/substr_count_error.phpt:1.1.2.2 Mon Jul 16 10:59:17 2007 +++ php-src/ext/standard/tests/strings/substr_count_error.phpt Thu Oct 4 13:31:11 2007 @@ -40,26 +40,26 @@ Notice: Undefined variable: str in %s on line %d -Warning: substr_count(): Offset should be greater than or equal to 0. in %s on line %d +Warning: substr_count(): Offset should be greater than or equal to 0 in %s on line %d bool(false) Notice: Undefined variable: str in %s on line %d -Warning: substr_count(): Offset value 25 exceeds string length. in %s on line %d +Warning: substr_count(): Offset value 25 exceeds string length in %s on line %d bool(false) Notice: Undefined variable: str in %s on line %d -Warning: substr_count(): Offset value 5 exceeds string length. in %s on line %d +Warning: substr_count(): Offset value 5 exceeds string length in %s on line %d bool(false) Notice: Undefined variable: str in %s on line %d -Warning: substr_count(): Length should be greater than 0. in %s on line %d +Warning: substr_count(): Length should be greater than 0 in %s on line %d bool(false) Notice: Undefined variable: str in %s on line %d -Warning: substr_count(): Length should be greater than 0. in %s on line %d +Warning: substr_count(): Length should be greater than 0 in %s on line %d bool(false) Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/uuencode.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/standard/tests/strings/uuencode.phpt diff -u php-src/ext/standard/tests/strings/uuencode.phpt:1.1.2.2 php-src/ext/standard/tests/strings/uuencode.phpt:1.1.2.3 --- php-src/ext/standard/tests/strings/uuencode.phpt:1.1.2.2 Wed Nov 15 17:27:03 2006 +++ php-src/ext/standard/tests/strings/uuencode.phpt Thu Oct 4 13:31:11 2007 @@ -35,6 +35,6 @@ " string(22) "not very sophisticated" -Warning: convert_uudecode(): The given parameter is not a valid uuencoded string. in %s on line %d +Warning: convert_uudecode(): The given parameter is not a valid uuencoded string in %s on line %d bool(false) Done