MFH: Removed ending dots from error messages

41 files changed, 172 insertions, 175 deletions

diff --git a/ext/standard/array.c b/ext/standard/array.c
index acc8ed3c88..30be25a809 100644
--- 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 a063bfab1f..4eb5a923aa 100644
--- 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 1c5bd70ba4..d22bda15e9 100644
--- 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 12103c2190..71cc2ea899 100644
--- 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 e54f08c5f8..5dd3dc6406 100644
--- 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 feec9bdddf..fadd7969b0 100644
--- 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 2a64528bcf..b484b6b151 100644
--- 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 02733aadd1..80f458c156 100644
--- 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 25aabab7be..f3acdb2981 100644
--- 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 9e95928686..7c4e5f4c1d 100644
--- 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 608350f555..d9e246b091 100644
--- 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 52fb11f5a7..2c4e0176b3 100644
--- 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 5d3abca2ce..963cecc0fb 100644
--- 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 3722e29aa5..bb9fc79b5e 100644
--- 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 805d240b87..c48a8f3edd 100644
--- 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 31570bf2bb..943114d512 100644
--- 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 5a12eca806..3498f5fce6 100644
--- 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 99292299d2..69308ea309 100644
--- a/ext/standard/tests/strings/chunk_split_variation5.phpt
+++ b/ext/standard/tests/strings/chunk_split_variation5.phpt
diff --git a/ext/standard/tests/strings/chunk_split_variation8.phpt b/ext/standard/tests/strings/chunk_split_variation8.phpt
index 63ea44f19f..cc6eeef98c 100644
--- 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 27de79ae20..2d56cd0aa4 100644
--- 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 2aaed8d054..3a4dabbe8c 100644
--- a/ext/standard/tests/strings/implode1.phpt
+++ b/ext/standard/tests/strings/implode1.phpt
diff --git a/ext/standard/tests/strings/join_error.phpt b/ext/standard/tests/strings/join_error.phpt
index d227b73d34..aa6bdc2306 100644
--- a/ext/standard/tests/strings/join_error.phpt
+++ b/ext/standard/tests/strings/join_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test join() function : error conditions(Bug#42789) 
+Test join() function: error conditions
 --FILE--
 <?php
 /* Prototype  : string join( string $glue, array $pieces )
@@ -45,6 +45,6 @@ NULL
 
 -- Testing join() with less than expected no. of arguments --
 
-Warning: join(): Argument to implode must be an array. in %s on line %d
+Warning: join(): Argument must be an array in %s on line %d
 NULL
 Done
diff --git a/ext/standard/tests/strings/join_variation2.phpt b/ext/standard/tests/strings/join_variation2.phpt
index b4c4ece16d..50395f1764 100644
--- a/ext/standard/tests/strings/join_variation2.phpt
+++ b/ext/standard/tests/strings/join_variation2.phpt
@@ -105,94 +105,94 @@ echo "Done\n";
 --- Testing join() by supplying different values for 'pieces' argument ---
 -- Iteration 1 --
 
-Warning: join(): Bad arguments. in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
 NULL
 -- Iteration 2 --
 
-Warning: join(): Bad arguments. in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
 NULL
 -- Iteration 3 --
 
-Warning: join(): Bad arguments. in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
 NULL
 -- Iteration 4 --
 
-Warning: join(): Bad arguments. in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
 NULL
 -- Iteration 5 --
 
-Warning: join(): Bad arguments. in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
 NULL
 -- Iteration 6 --
 
-Warning: join(): Bad arguments. in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
 NULL
 -- Iteration 7 --
 
-Warning: join(): Bad arguments. in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
 NULL
 -- Iteration 8 --
 
-Warning: join(): Bad arguments. in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
 NULL
 -- Iteration 9 --
 
-Warning: join(): Bad arguments. in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
 NULL
 -- Iteration 10 --
 
-Warning: join(): Bad arguments. in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
 NULL
 -- Iteration 11 --
 
-Warning: join(): Bad arguments. in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
 NULL
 -- Iteration 12 --
 
-Warning: join(): Bad arguments. in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
 NULL
 -- Iteration 13 --
 
-Warning: join(): Bad arguments. in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
 NULL
 -- Iteration 14 --
 
-Warning: join(): Bad arguments. in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
 NULL
 -- Iteration 15 --
 
-Warning: join(): Bad arguments. in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
 NULL
 -- Iteration 16 --
 
-Warning: join(): Bad arguments. in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
 NULL
 -- Iteration 17 --
 
-Warning: join(): Bad arguments. in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
 NULL
 -- Iteration 18 --
 
-Warning: join(): Bad arguments. in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
 NULL
 -- Iteration 19 --
 
-Warning: join(): Bad arguments. in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
 NULL
 -- Iteration 20 --
 
-Warning: join(): Bad arguments. in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
 NULL
 -- Iteration 21 --
 
-Warning: join(): Bad arguments. in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
 NULL
 -- Iteration 22 --
 
-Warning: join(): Bad arguments. in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
 NULL
 -- Iteration 23 --
 
-Warning: join(): Bad arguments. in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
 NULL
 Done
diff --git a/ext/standard/tests/strings/str_pad.phpt b/ext/standard/tests/strings/str_pad.phpt
index c9f1e56d06..5509d9d9e2 100644
--- a/ext/standard/tests/strings/str_pad.phpt
+++ b/ext/standard/tests/strings/str_pad.phpt
diff --git a/ext/standard/tests/strings/str_repeat.phpt b/ext/standard/tests/strings/str_repeat.phpt
index 858575d4ca..49d0ab0986 100644
--- a/ext/standard/tests/strings/str_repeat.phpt
+++ b/ext/standard/tests/strings/str_repeat.phpt
diff --git a/ext/standard/tests/strings/stripos_variation1.phpt b/ext/standard/tests/strings/stripos_variation1.phpt
index 38d2578d95..f3e743cc02 100644
--- 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 5b79b99e32..efdbb52389 100644
--- 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 b29b1a87e6..4736761261 100644
--- 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 4cd2e75bcf..023585dbb7 100644
--- 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 59ac83f701..2304c1d350 100644
--- 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 2f02b0e51a..e4d8a153e0 100644
--- 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 75d0ddfb84..29a0a20469 100644
--- 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 5c617a20da..51c4dae97c 100644
--- 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 83dd20a59c..e644681350 100644
--- a/ext/standard/tests/strings/strpos.phpt
+++ b/ext/standard/tests/strings/strpos.phpt
diff --git a/ext/standard/tests/strings/strstr.phpt b/ext/standard/tests/strings/strstr.phpt
index fc00ea098a..ab10c9efbe 100644
--- a/ext/standard/tests/strings/strstr.phpt
+++ b/ext/standard/tests/strings/strstr.phpt
diff --git a/ext/standard/tests/strings/substr_count_error.phpt b/ext/standard/tests/strings/substr_count_error.phpt
index 01d4caa6ad..f8284c3a1d 100644
--- 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 9c77a5072d..3671cd736c 100644
--- 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 b9888e4c10..7892417655 100644
--- 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 33ef6b32fe..cbfd151f8b 100644
--- 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 9a54fe6c08..218ba1496b 100644
--- 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 820c3077f1..0c5a82db52 100644
--- 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);