MFH: Removed ending dots from error messages

diff --git a/ext/standard/array.c b/ext/standard/array.c
index acc8ed3c8843e0922cbf13f7094f272e11150c14..30be25a809cacc1e7867f511c86eef9a48db854a 100644 (file)
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -618,7 +618,7 @@ static int array_user_compare(const void *a, const void *b TSRMLS_DC) /* {{{ */
 /* 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 @@ static void php_array_intersect(INTERNAL_FUNCTION_PARAMETERS, int behavior, int
                                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 {

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index a063bfab1f7b3330566edd8e4bc3f349f1251589..4eb5a923aae8a39b1980740d1758171692e0ef48 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -4496,7 +4496,7 @@ PHP_FUNCTION(putenv)
                }
        }
 
-       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 @@ PHP_FUNCTION(time_sleep_until)
 
        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 @@ static int copy_request_variable(void *pDest, int num_args, va_list args, zend_h
        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;
        }
 

diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c
index 1c5bd70ba46feb94b20944fc15728e33d07a729c..d22bda15e92746b51e817a824d4a3f2349097078 100644 (file)
--- a/ext/standard/browscap.c
+++ b/ext/standard/browscap.c
@@ -290,7 +290,7 @@ PHP_FUNCTION(get_browser)
        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;
        }
 

diff --git a/ext/standard/exec.c b/ext/standard/exec.c
index 12103c21909e29f573fd461af07cfe377db915a1..71cc2ea899dbedda0ac9b0ac8a8d70a4b26e84ea 100644 (file)
--- a/ext/standard/exec.c
+++ b/ext/standard/exec.c
@@ -463,7 +463,7 @@ PHP_FUNCTION(proc_nice)
        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;
        }
        

diff --git a/ext/standard/filters.c b/ext/standard/filters.c
index e54f08c5f8b25291cf92748c70211beccc5681f8..5dd3dc6406f29dd5cdc01c5b390383945f336437 100644 (file)
--- a/ext/standard/filters.c
+++ b/ext/standard/filters.c
@@ -1880,7 +1880,7 @@ static php_stream_filter *consumed_filter_create(const char *filtername, zval *f
        /* 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;

diff --git a/ext/standard/formatted_print.c b/ext/standard/formatted_print.c
index feec9bdddf1cc69fd976388601e91d2443f0a409..fadd7969b0ed7744e133f1a3ea7dfdf0746315f7 100644 (file)
--- a/ext/standard/formatted_print.c
+++ b/ext/standard/formatted_print.c
@@ -445,7 +445,7 @@ php_formatted_print(int ht, int *len, int use_array, int format_offset TSRMLS_DC
                                        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 @@ php_formatted_print(int ht, int *len, int use_array, int format_offset TSRMLS_DC
                                        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 @@ php_formatted_print(int ht, int *len, int use_array, int format_offset TSRMLS_DC
                                                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;

diff --git a/ext/standard/ftp_fopen_wrapper.c b/ext/standard/ftp_fopen_wrapper.c
index 2a64528bcf820c937a9b67ed0840a8dc20acfdf5..b484b6b1515706d6577d0df48f161414b1762b55 100644 (file)
--- a/ext/standard/ftp_fopen_wrapper.c
+++ b/ext/standard/ftp_fopen_wrapper.c
@@ -412,7 +412,7 @@ php_stream * php_stream_url_wrap_ftp(php_stream_wrapper *wrapper, char *path, ch
        }
        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 @@ php_stream * php_stream_url_wrap_ftp(php_stream_wrapper *wrapper, char *path, ch
        }
        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 @@ php_stream * php_stream_url_wrap_ftp(php_stream_wrapper *wrapper, char *path, ch
                                        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;
                        }

diff --git a/ext/standard/http.c b/ext/standard/http.c
index 02733aadd15b763904de2730b50e65cd6a1e1f44..80f458c1566b8d1c96b1beaaec72fb60286ee1d9 100644 (file)
--- a/ext/standard/http.c
+++ b/ext/standard/http.c
@@ -76,7 +76,7 @@ PHPAPI int php_url_encode_hash_ex(HashTable *ht, smart_str *formstr,
                }
 
                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 @@ PHP_FUNCTION(http_build_query)
        }
 
        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;
        }
 

diff --git a/ext/standard/http_fopen_wrapper.c b/ext/standard/http_fopen_wrapper.c
index 25aabab7bebd26aa08b5500ca5d45d1bbb37e37d..f3acdb29819823b648c010d998c824f348dfb3c6 100644 (file)
--- a/ext/standard/http_fopen_wrapper.c
+++ b/ext/standard/http_fopen_wrapper.c
@@ -137,7 +137,7 @@ php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char *path,
                /* 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;
                }

diff --git a/ext/standard/image.c b/ext/standard/image.c
index 9e9592868688de3e4b7a827af0d0d8964b663535..7c4e5f4c1d1d0b2d0adaca79dd8ca1fd096662f1 100644 (file)
--- a/ext/standard/image.c
+++ b/ext/standard/image.c
@@ -1317,8 +1317,7 @@ PHP_FUNCTION(getimagesize)
 #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:

diff --git a/ext/standard/mail.c b/ext/standard/mail.c
index 608350f555897d1c6744535e003707055777b6cd..d9e246b091fd497d692b5cc917ac5b12da28b6b6 100644 (file)
--- a/ext/standard/mail.c
+++ b/ext/standard/mail.c
@@ -98,7 +98,7 @@ PHP_FUNCTION(mail)
        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;
        }       
        

diff --git a/ext/standard/php_fopen_wrapper.c b/ext/standard/php_fopen_wrapper.c
index 52fb11f5a70e5a9ce4894b3c61d79b82c13aedc8..2c4e0176b33d7d6578b08c6303b1ee427bb7dc1e 100644 (file)
--- a/ext/standard/php_fopen_wrapper.c
+++ b/ext/standard/php_fopen_wrapper.c
@@ -253,7 +253,7 @@ php_stream * php_stream_url_wrap_php(php_stream_wrapper *wrapper, char *path, ch
                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;
                }

diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c
index 5d3abca2ce0e8bca76f3849abf3bf8284854b1b4..963cecc0fb3d5cb3f3e241879e11176ab39d57aa 100644 (file)
--- a/ext/standard/streamsfuncs.c
+++ b/ext/standard/streamsfuncs.c
@@ -357,7 +357,7 @@ PHP_FUNCTION(stream_socket_recvfrom)
        }
 
        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_FUNCTION(stream_get_contents)
        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_FUNCTION(stream_copy_to_stream)
        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 @@ PHP_FUNCTION(stream_select)
                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 @@ PHP_FUNCTION(stream_context_get_options)
        }
        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 @@ PHP_FUNCTION(stream_context_set_option)
        /* 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 @@ PHP_FUNCTION(stream_context_set_params)
 
        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 @@ PHP_FUNCTION(stream_get_line)
        }
 
        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) {

diff --git a/ext/standard/string.c b/ext/standard/string.c
index 3722e29aa5ae9df5adf548650793fbc763f267a8..bb9fc79b5e511f03dd20053ea43f8d620116c90d 100644 (file)
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -511,22 +511,22 @@ static inline int php_charmask(unsigned char *input, int len, char *mask TSRMLS_
                        /* 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 @@ PHP_FUNCTION(explode)
        }
 
        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 @@ 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;
                }
        }
@@ -1544,7 +1544,7 @@ PHP_FUNCTION(stristr)
 
        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 @@ PHP_FUNCTION(strstr)
 
        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 @@ PHP_FUNCTION(strpos)
        }
 
        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 @@ PHP_FUNCTION(stripos)
        }
 
        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 @@ PHP_FUNCTION(stripos)
                                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 @@ PHP_FUNCTION(chunk_split)
        }
 
        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 @@ PHP_FUNCTION(substr_replace)
 
        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 @@ PHP_FUNCTION(substr_replace)
                        }
                }
        }
-
        
        if (Z_TYPE_PP(str) != IS_ARRAY) {
                if (Z_TYPE_PP(from) != IS_ARRAY) {
@@ -2253,7 +2251,7 @@ PHP_FUNCTION(substr_replace)
                        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 @@ PHP_FUNCTION(strtr)
        }
        
        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 @@ PHP_FUNCTION(setlocale)
                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 @@ PHP_FUNCTION(setlocale)
                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 @@ PHP_FUNCTION(str_repeat)
        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 @@ PHP_FUNCTION(count_chars)
                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 @@ PHP_FUNCTION(substr_count)
        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 @@ PHP_FUNCTION(substr_count)
        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 @@ PHP_FUNCTION(substr_count)
                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 @@ PHP_FUNCTION(str_pad)
        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 @@ PHP_FUNCTION(str_pad)
                        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 @@ PHP_FUNCTION(str_split)
        }
 
        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 @@ PHP_FUNCTION(strpbrk)
        }
 
        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 @@ PHP_FUNCTION(substr_compare)
                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;
        }

diff --git a/ext/standard/tests/general_functions/import_request.phpt b/ext/standard/tests/general_functions/import_request.phpt
index 805d240b87d8daecd8f102c72ea487ad9178d86f..c48a8f3edd266bbee60413509f5da51cded55c25 100644 (file)
--- a/ext/standard/tests/general_functions/import_request.phpt
+++ b/ext/standard/tests/general_functions/import_request.phpt
@@ -39,7 +39,7 @@ Notice: import_request_variables(): No prefix specified - possible security haza
 
 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

diff --git a/ext/standard/tests/strings/bug40754.phpt b/ext/standard/tests/strings/bug40754.phpt
index 31570bf2bbf830b36624fa17b2bdd6c2ad2dcd1f..943114d512377bb12e91b229b9d63540714f0788 100644 (file)
--- a/ext/standard/tests/strings/bug40754.phpt
+++ b/ext/standard/tests/strings/bug40754.phpt
@@ -32,25 +32,25 @@ string(6) "abcdex"
 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

diff --git a/ext/standard/tests/strings/chunk_split_variation2.phpt b/ext/standard/tests/strings/chunk_split_variation2.phpt
index 5a12eca8067a81b04b8c94aa620e064c6971aca6..3498f5fce61870fdc68a3df021aa8a800966ffb2 100644 (file)
--- a/ext/standard/tests/strings/chunk_split_variation2.phpt
+++ b/ext/standard/tests/strings/chunk_split_variation2.phpt
@@ -95,21 +95,21 @@ fclose($fp);
 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*"
 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 @@ Notice: Object of class MyClass could not be converted to int in %s on line %d
 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*"

diff --git a/ext/standard/tests/strings/chunk_split_variation5.phpt b/ext/standard/tests/strings/chunk_split_variation5.phpt
index 99292299d2f7bb1a2091d57b33b6aa10e195405d..69308ea309b284379695ec99b05c83b39902ed8b 100644 (file)
Binary files a/ext/standard/tests/strings/chunk_split_variation5.phpt and b/ext/standard/tests/strings/chunk_split_variation5.phpt differ

diff --git a/ext/standard/tests/strings/chunk_split_variation8.phpt b/ext/standard/tests/strings/chunk_split_variation8.phpt
index 63ea44f19fea98a5d8ec6c5dc5b43b5938ccddf8..cc6eeef98c03df4ac7dd744d4c7112b919d90dde 100644 (file)
--- a/ext/standard/tests/strings/chunk_split_variation8.phpt
+++ b/ext/standard/tests/strings/chunk_split_variation8.phpt
@@ -51,7 +51,7 @@ echo "Done"
 *** 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 @@ string(504) "T:::h:::i:::s:::':::s::: :::h:::e:::r:::e:::d:::o:::c::: :::s:::t::
 :::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 @@ It has _speci@l ch@r$ 2222 !!!Now \k as escape char to test
 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

diff --git a/ext/standard/tests/strings/explode1.phpt b/ext/standard/tests/strings/explode1.phpt
index 27de79ae2013038bcd4879555180c5e7098183c3..2d56cd0aa471f0131c16ac29fe2668960b74c16a 100644 (file)
--- a/ext/standard/tests/strings/explode1.phpt
+++ b/ext/standard/tests/strings/explode1.phpt
@@ -88,29 +88,29 @@ echo "Done\n";
 *** 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 @@ array(2) {
 }
 -- 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) {

diff --git a/ext/standard/tests/strings/implode1.phpt b/ext/standard/tests/strings/implode1.phpt
index 2aaed8d05431015573395e0817db40ec9825c292..3a4dabbe8c4aeba6942ad32be0611c74d0b16551 100644 (file)
Binary files a/ext/standard/tests/strings/implode1.phpt and b/ext/standard/tests/strings/implode1.phpt differ

diff --git a/ext/standard/tests/strings/join_error.phpt b/ext/standard/tests/strings/join_error.phpt
index d227b73d34869a6aadeddb896b3877326c24ac7a..aa6bdc23061ec60067e18b7b4a640e85ae63d40f 100644 (file)
--- 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 b4c4ece16d4ef4c27b124781b7086818214a3e14..50395f17647b17e92686ea37202193fae4ea55d2 100644 (file)
--- 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

diff --git a/ext/standard/tests/strings/str_pad.phpt b/ext/standard/tests/strings/str_pad.phpt
index c9f1e56d065f3ceaaa0ebcdf237e23395a8bd67d..5509d9d9e201f1745ffe983a9ae0daf98d895ac6 100644 (file)
Binary files a/ext/standard/tests/strings/str_pad.phpt and b/ext/standard/tests/strings/str_pad.phpt differ

diff --git a/ext/standard/tests/strings/str_repeat.phpt b/ext/standard/tests/strings/str_repeat.phpt
index 858575d4ca417e3731e8dc6966182739dc3181a8..49d0ab09868e43e23c5983c1c7e71e9e586063a4 100644 (file)
Binary files a/ext/standard/tests/strings/str_repeat.phpt and b/ext/standard/tests/strings/str_repeat.phpt differ

diff --git a/ext/standard/tests/strings/stripos_variation1.phpt b/ext/standard/tests/strings/stripos_variation1.phpt
index 38d2578d9563c4f7175e5d9e50c4d6258d709371..f3e743cc028d94d8925650af1ec704ea66c0d7a0 100644 (file)
--- a/ext/standard/tests/strings/stripos_variation1.phpt
+++ b/ext/standard/tests/strings/stripos_variation1.phpt
@@ -118,17 +118,17 @@ int(8)
 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)

diff --git a/ext/standard/tests/strings/stripos_variation10.phpt b/ext/standard/tests/strings/stripos_variation10.phpt
index 5b79b99e3220c002a899a60e5a6671f1e7623596..efdbb52389e70d570b5312179faecdf104c89f81 100644 (file)
--- a/ext/standard/tests/strings/stripos_variation10.phpt
+++ b/ext/standard/tests/strings/stripos_variation10.phpt
@@ -123,27 +123,27 @@ bool(false)
 
 -- 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 @@ 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)
 
 -- Iteration 20 --
@@ -171,26 +171,26 @@ bool(false)
 
 -- 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 ***

diff --git a/ext/standard/tests/strings/stripos_variation11.phpt b/ext/standard/tests/strings/stripos_variation11.phpt
index b29b1a87e67bee2fb1f38601a6dd01351e326fc1..47367612619348d5f88e1e3940842ae7af97adcf 100644 (file)
--- a/ext/standard/tests/strings/stripos_variation11.phpt
+++ b/ext/standard/tests/strings/stripos_variation11.phpt
@@ -158,7 +158,7 @@ bool(false)
 -- 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 @@ bool(false)
 -- 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 @@ NULL
 -- 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 ***

diff --git a/ext/standard/tests/strings/stripos_variation14.phpt b/ext/standard/tests/strings/stripos_variation14.phpt
index 4cd2e75bcf585b85b1e7bfdfbe85650707c68bc5..023585dbb765ba049a911dffe93efe2cf7d500ea 100644 (file)
--- a/ext/standard/tests/strings/stripos_variation14.phpt
+++ b/ext/standard/tests/strings/stripos_variation14.phpt
@@ -90,11 +90,11 @@ echo "*** Done ***";
 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)

diff --git a/ext/standard/tests/strings/stripos_variation15.phpt b/ext/standard/tests/strings/stripos_variation15.phpt
index 59ac83f7011a81114bf7d3ed089aea4fd2df2969..2304c1d35003f1aa160f606b26759c51c70effa6 100644 (file)
--- a/ext/standard/tests/strings/stripos_variation15.phpt
+++ b/ext/standard/tests/strings/stripos_variation15.phpt
@@ -94,23 +94,23 @@ bool(false)
 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)

diff --git a/ext/standard/tests/strings/stripos_variation2.phpt b/ext/standard/tests/strings/stripos_variation2.phpt
index 2f02b0e51ac108c07fb6fb4bb3b27ccd8f877449..e4d8a153e0cf0f5f6a5af287447f89fba1709bc3 100644 (file)
--- a/ext/standard/tests/strings/stripos_variation2.phpt
+++ b/ext/standard/tests/strings/stripos_variation2.phpt
@@ -120,17 +120,17 @@ int(10)
 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)

diff --git a/ext/standard/tests/strings/stripos_variation7.phpt b/ext/standard/tests/strings/stripos_variation7.phpt
index 75d0ddfb848a4e1ece4009761bbe0128f4d2b4d7..29a0a20469ac37a6f489c6fcc0684ced2b16c641 100644 (file)
--- a/ext/standard/tests/strings/stripos_variation7.phpt
+++ b/ext/standard/tests/strings/stripos_variation7.phpt
@@ -27,7 +27,7 @@ echo "*** Done ***";
 -- 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)

diff --git a/ext/standard/tests/strings/stristr.phpt b/ext/standard/tests/strings/stristr.phpt
index 5c617a20dadd008a7573ebd2338146f078d95f12..51c4dae97c16649b8ab83bcb3a9cf047ee7b2bbc 100644 (file)
--- a/ext/standard/tests/strings/stristr.phpt
+++ b/ext/standard/tests/strings/stristr.phpt
@@ -24,7 +24,7 @@ NULL
 
 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)
 

diff --git a/ext/standard/tests/strings/strpos.phpt b/ext/standard/tests/strings/strpos.phpt
index 83dd20a59c3df84422d07f4a6dc91f315860a764..e64468135082651638234b2de27f0848d897d4d5 100644 (file)
Binary files a/ext/standard/tests/strings/strpos.phpt and b/ext/standard/tests/strings/strpos.phpt differ

diff --git a/ext/standard/tests/strings/strstr.phpt b/ext/standard/tests/strings/strstr.phpt
index fc00ea098a25306c779ff8264c0466712217ef3c..ab10c9efbe9ca19122b76f8dad2e94d16df50ef1 100644 (file)
Binary files a/ext/standard/tests/strings/strstr.phpt and b/ext/standard/tests/strings/strstr.phpt differ

diff --git a/ext/standard/tests/strings/substr_count_error.phpt b/ext/standard/tests/strings/substr_count_error.phpt
index 01d4caa6ad821909c8d8a3329d56de839df64669..f8284c3a1da9c70fb2b340a3f01ad498ecfbd26c 100644 (file)
--- a/ext/standard/tests/strings/substr_count_error.phpt
+++ b/ext/standard/tests/strings/substr_count_error.phpt
@@ -40,26 +40,26 @@ NULL
 
 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

diff --git a/ext/standard/tests/strings/uuencode.phpt b/ext/standard/tests/strings/uuencode.phpt
index 9c77a5072d7348cb1a1fe7c1c8ca783df64602ab..3671cd736ce88b74eacb8ac8ebe64bb42789fe76 100644 (file)
--- a/ext/standard/tests/strings/uuencode.phpt
+++ b/ext/standard/tests/strings/uuencode.phpt
@@ -35,6 +35,6 @@ string(36) "6;F]T('9E<GD@<V]P:&ES=&EC871E9```
 "
 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

diff --git a/ext/standard/uniqid.c b/ext/standard/uniqid.c
index b9888e4c10b78d12c7a0c019ab9726535e5a5f9c..78924176552b6ecca0ec562a962bcef9ccbdfd61 100644 (file)
--- a/ext/standard/uniqid.c
+++ b/ext/standard/uniqid.c
@@ -61,7 +61,7 @@ PHP_FUNCTION(uniqid)
 #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);

diff --git a/ext/standard/url.c b/ext/standard/url.c
index 33ef6b32fedbd18524b84b6018df39acbe8f4c5c..cbfd151f8b739984b083a38d2d4899d0abfdae70 100644 (file)
--- a/ext/standard/url.c
+++ b/ext/standard/url.c
@@ -375,7 +375,7 @@ PHP_FUNCTION(parse_url)
                                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;

diff --git a/ext/standard/uuencode.c b/ext/standard/uuencode.c
index 9a54fe6c089afebcd62c51335a7a7078af0a87df..218ba1496beba8e3039e41b45b0f162f58a546e5 100644 (file)
--- a/ext/standard/uuencode.c
+++ b/ext/standard/uuencode.c
@@ -215,7 +215,7 @@ PHP_FUNCTION(convert_uudecode)
 
        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;
        }
 

diff --git a/ext/standard/var.c b/ext/standard/var.c
index 820c3077f16f83b46d08889b5545aa15862860e4..0c5a82db52fb2cdcfa445f7c2faa87a9f8062b25 100644 (file)
--- a/ext/standard/var.c
+++ b/ext/standard/var.c
@@ -589,7 +589,7 @@ static void php_var_serialize_class(smart_str *buf, zval *struc, zval *retval_pt
                        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 @@ static void php_var_serialize_intern(smart_str *buf, zval *struc, HashTable *var
                                                        } 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);