Make error messages more consistent by fixing capitalization

Closes GH-5066 As a first step, let's capitalize their initial letter when it is applicable.

Zend/tests/bug30998.phpt

@@ -14,6 +14,6 @@ set_error_handler('my_error');
 $f = fopen("/tmp/blah", "r");
 ?>
 --EXPECTF--
-fopen(/tmp/blah): failed to open stream: %s (2) in %s:%d
+fopen(/tmp/blah): Failed to open stream: %s (2) in %s:%d
 
-Warning: fopen(/tmp/blah): failed to open stream: %s in %s on line %d
+Warning: fopen(/tmp/blah): Failed to open stream: %s in %s on line %d

Zend/tests/bug60909_1.phpt

@@ -10,7 +10,7 @@ set_error_handler(function($errno, $errstr, $errfile, $errline){
 
 require 'notfound.php';
 --EXPECTF--
-error(require(notfound.php): failed to open stream: %s)
+error(require(notfound.php): Failed to open stream: %s)
 Fatal error: Uncaught Exception: Foo in %sbug60909_1.php:5
 Stack trace:
 #0 %sbug60909_1.php(8): {closure}(2, 'require(notfoun...', '%s', 8)

Zend/tests/bug64960.phpt

@@ -29,7 +29,7 @@ set_error_handler(function()
 $a['waa'];
 ?>
 --EXPECTF--
-Notice: ob_end_flush(): failed to delete and flush buffer. No buffer to delete or flush in %sbug64960.php on line 3
+Notice: ob_end_flush(): Failed to delete and flush buffer. No buffer to delete or flush in %sbug64960.php on line 3
 
 Fatal error: Uncaught Exception in %sbug64960.php:19
 Stack trace:

Zend/tests/debug_backtrace_with_include_and_this.phpt

@@ -28,7 +28,7 @@ try {
   echo $e."\n";
 }
 --EXPECTF--
-ERR#2: include(class://non.existent.Class): failed to open stream: "CLWrapper::stream_open" call failed @ include
+ERR#2: include(class://non.existent.Class): Failed to open stream: "CLWrapper::stream_open" call failed @ include
 ERR#2: include(): Failed opening 'class://non.existent.Class' for inclusion (include_path='%s') @ include
 
 Fatal error: Uncaught Exception: Failed loading class://non.existent.Class in %s

Zend/tests/include_stat_is_quiet.phpt

@@ -25,6 +25,6 @@ try {
 
 ?>
 --EXPECTF--
-Warning: require_once(doesnt_exist.php): failed to open stream: No such file or directory in %s on line %d
+Warning: require_once(doesnt_exist.php): Failed to open stream: No such file or directory in %s on line %d
 
 Fatal error: require_once(): Failed opening required 'doesnt_exist.php' (include_path='test://foo:test://bar') in %s on line %d

Zend/zend_exceptions.c

@@ -627,7 +627,7 @@ ZEND_METHOD(exception, getTraceAsString)
 
 	trace = zend_read_property_ex(base_ce, object, ZSTR_KNOWN(ZEND_STR_TRACE), 1, &rv);
 	if (Z_TYPE_P(trace) != IS_ARRAY) {
-		zend_type_error("trace is not an array");
+		zend_type_error("Trace is not an array");
 		return;
 	}
 	ZEND_HASH_FOREACH_NUM_KEY_VAL(Z_ARRVAL_P(trace), index, frame) {

ext/bcmath/libbcmath/src/raise.c

@@ -54,10 +54,10 @@ bc_raise (bc_num num1, bc_num num2, bc_num *result, int scale)
 
    /* Check the exponent for scale digits and convert to a long. */
    if (num2->n_scale != 0)
-     php_error_docref (NULL, E_WARNING, "non-zero scale in exponent");
+     php_error_docref (NULL, E_WARNING, "Non-zero scale in exponent");
    exponent = bc_num2long (num2);
    if (exponent == 0 && (num2->n_len > 1 || num2->n_value[0] != 0))
-       php_error_docref (NULL, E_WARNING, "exponent too large");
+       php_error_docref (NULL, E_WARNING, "Exponent too large");
 
    /* Special case if exponent is a zero. */
    if (exponent == 0)

ext/bcmath/libbcmath/src/raisemod.c

@@ -79,21 +79,21 @@ bc_raisemod (bc_num base, bc_num expo, bc_num mod, bc_num *result, int scale)
   /* Check the base for scale digits. */
   if (power->n_scale != 0)
     {
-      php_error_docref (NULL, E_WARNING, "non-zero scale in base");
+      php_error_docref (NULL, E_WARNING, "Non-zero scale in base");
       _bc_truncate (&power);
     }
 
   /* Check the exponent for scale digits. */
   if (exponent->n_scale != 0)
     {
-      php_error_docref (NULL, E_WARNING, "non-zero scale in exponent");
+      php_error_docref (NULL, E_WARNING, "Non-zero scale in exponent");
       _bc_truncate (&exponent);
     }
 
   /* Check the modulus for scale digits. */
   if (modulus->n_scale != 0)
     {
-      php_error_docref (NULL, E_WARNING, "non-zero scale in modulus");
+      php_error_docref (NULL, E_WARNING, "Non-zero scale in modulus");
       _bc_truncate (&modulus);
     }
 

ext/bcmath/tests/bcpow_error1.phpt

@@ -9,5 +9,5 @@ if (!extension_loaded('bcmath')) die('skip bcmath extension is not available');
 var_dump(bcpow('1', '1.1', 2));
 ?>
 --EXPECTF--
-Warning: bcpow(): non-zero scale in exponent in %s on line %d
+Warning: bcpow(): Non-zero scale in exponent in %s on line %d
 string(4) "1.00"

ext/bcmath/tests/bcpow_error2.phpt

@@ -9,5 +9,5 @@ if (!extension_loaded('bcmath')) die('skip bcmath extension is not available');
 var_dump(bcpow('0', '9223372036854775808', 2));
 ?>
 --EXPECTF--
-Warning: bcpow(): exponent too large in %s on line %d
+Warning: bcpow(): Exponent too large in %s on line %d
 string(4) "1.00"

ext/bcmath/tests/bug72093.phpt

@@ -12,5 +12,5 @@ var_dump(bcpowmod(1, 1.2, 1, 1));
 --EXPECTF--
 string(1) "1"
 
-Warning: bcpowmod(): non-zero scale in exponent in %s on line %d
+Warning: bcpowmod(): Non-zero scale in exponent in %s on line %d
 string(3) "0.0"

ext/bcmath/tests/bug75178.phpt

@@ -10,8 +10,8 @@ var_dump(bcpowmod('4.1', '4', '3', 3));
 var_dump(bcpowmod('4', '4', '3.1', 3));
 ?>
 --EXPECTF--
-Warning: bcpowmod(): non-zero scale in base in %s on line %d
+Warning: bcpowmod(): Non-zero scale in base in %s on line %d
 string(5) "1.000"
 
-Warning: bcpowmod(): non-zero scale in modulus in %s on line %d
+Warning: bcpowmod(): Non-zero scale in modulus in %s on line %d
 string(5) "1.000"

ext/bz2/bz2.c

@@ -374,12 +374,12 @@ static PHP_FUNCTION(bzopen)
 	/* If it's not a resource its a string containing the filename to open */
 	if (Z_TYPE_P(file) == IS_STRING) {
 		if (Z_STRLEN_P(file) == 0) {
-			php_error_docref(NULL, E_WARNING, "filename cannot be empty");
+			php_error_docref(NULL, E_WARNING, "Filename cannot be empty");
 			RETURN_FALSE;
 		}
 
 		if (CHECK_ZVAL_NULL_PATH(file)) {
-			zend_type_error("filename must not contain null bytes");
+			zend_type_error("Filename must not contain null bytes");
 			RETURN_THROWS();
 		}
 
@@ -393,10 +393,10 @@ static PHP_FUNCTION(bzopen)
 		stream_mode_len = strlen(stream->mode);
 
 		if (stream_mode_len != 1 && !(stream_mode_len == 2 && memchr(stream->mode, 'b', 2))) {
-			php_error_docref(NULL, E_WARNING, "cannot use stream opened in mode '%s'", stream->mode);
+			php_error_docref(NULL, E_WARNING, "Cannot use stream opened in mode '%s'", stream->mode);
 			RETURN_FALSE;
 		} else if (stream_mode_len == 1 && stream->mode[0] != 'r' && stream->mode[0] != 'w' && stream->mode[0] != 'a' && stream->mode[0] != 'x') {
-			php_error_docref(NULL, E_WARNING, "cannot use stream opened in mode '%s'", stream->mode);
+			php_error_docref(NULL, E_WARNING, "Cannot use stream opened in mode '%s'", stream->mode);
 			RETURN_FALSE;
 		}
 
@@ -404,7 +404,7 @@ static PHP_FUNCTION(bzopen)
 			case 'r':
 				/* only "r" and "rb" are supported */
 				if (stream->mode[0] != mode[0] && !(stream_mode_len == 2 && stream->mode[1] != mode[0])) {
-					php_error_docref(NULL, E_WARNING, "cannot read from a stream opened in write only mode");
+					php_error_docref(NULL, E_WARNING, "Cannot read from a stream opened in write only mode");
 					RETURN_FALSE;
 				}
 				break;

ext/bz2/tests/001.phpt

@@ -39,14 +39,14 @@ var_dump(bzopen($fp, "r"));
 --EXPECTF--
 '' is not a valid mode for bzopen(). Only 'w' and 'r' are supported.
 
-Warning: bzopen(): filename cannot be empty in %s on line %d
+Warning: bzopen(): Filename cannot be empty in %s on line %d
 bool(false)
 
-Warning: bzopen(): filename cannot be empty in %s on line %d
+Warning: bzopen(): Filename cannot be empty in %s on line %d
 bool(false)
 'x' is not a valid mode for bzopen(). Only 'w' and 'r' are supported.
 'rw' is not a valid mode for bzopen(). Only 'w' and 'r' are supported.
 
-Warning: bzopen(no_such_file): failed to open stream: No such file or directory in %s on line %d
+Warning: bzopen(no_such_file): Failed to open stream: No such file or directory in %s on line %d
 bool(false)
 resource(%d) of type (stream)

ext/bz2/tests/002.phpt

@@ -85,47 +85,47 @@ resource(%d) of type (stream)
 resource(%d) of type (stream)
 resource(%d) of type (stream)
 
-Warning: bzopen(): cannot read from a stream opened in write only mode in %s on line %d
+Warning: bzopen(): Cannot read from a stream opened in write only mode in %s on line %d
 bool(false)
 resource(%d) of type (stream)
 resource(%d) of type (stream)
 
-Warning: fopen(bz_open_002.txt): failed to open stream: Bad file %s in %s on line %d
+Warning: fopen(bz_open_002.txt): Failed to open stream: Bad file %s in %s on line %d
 First parameter has to be string or file-resource
 
-Warning: fopen(bz_open_002.txt): failed to open stream: Bad file %s in %s on line %d
+Warning: fopen(bz_open_002.txt): Failed to open stream: Bad file %s in %s on line %d
 First parameter has to be string or file-resource
 
 Warning: bzopen(): cannot write to a stream opened in read only mode in %s on line %d
 bool(false)
 
-Warning: bzopen(): cannot read from a stream opened in write only mode in %s on line %d
+Warning: bzopen(): Cannot read from a stream opened in write only mode in %s on line %d
 bool(false)
 
-Warning: bzopen(): cannot use stream opened in mode 'rw' in %s on line %d
+Warning: bzopen(): Cannot use stream opened in mode 'rw' in %s on line %d
 bool(false)
 
-Warning: bzopen(): cannot use stream opened in mode 'rw' in %s on line %d
+Warning: bzopen(): Cannot use stream opened in mode 'rw' in %s on line %d
 bool(false)
 
-Warning: bzopen(): cannot use stream opened in mode 'wr' in %s on line %d
+Warning: bzopen(): Cannot use stream opened in mode 'wr' in %s on line %d
 bool(false)
 
-Warning: bzopen(): cannot use stream opened in mode 'wr' in %s on line %d
+Warning: bzopen(): Cannot use stream opened in mode 'wr' in %s on line %d
 bool(false)
 
-Warning: bzopen(): cannot use stream opened in mode 'r+' in %s on line %d
+Warning: bzopen(): Cannot use stream opened in mode 'r+' in %s on line %d
 bool(false)
 
-Warning: bzopen(): cannot use stream opened in mode 'r+' in %s on line %d
+Warning: bzopen(): Cannot use stream opened in mode 'r+' in %s on line %d
 bool(false)
 
-Warning: bzopen(): cannot use stream opened in mode 'w+' in %s on line %d
+Warning: bzopen(): Cannot use stream opened in mode 'w+' in %s on line %d
 bool(false)
 
-Warning: bzopen(): cannot use stream opened in mode 'w+' in %s on line %d
+Warning: bzopen(): Cannot use stream opened in mode 'w+' in %s on line %d
 bool(false)
 
-Warning: bzopen(): cannot read from a stream opened in write only mode in %s on line %d
+Warning: bzopen(): Cannot read from a stream opened in write only mode in %s on line %d
 bool(false)
 resource(%d) of type (stream)

ext/bz2/tests/bzopen_string_filename_with_null_bytes.phpt

@@ -19,5 +19,5 @@ try {
 
 ?>
 --EXPECT--
-filename must not contain null bytes
+Filename must not contain null bytes
-filename must not contain null bytes
+Filename must not contain null bytes

ext/calendar/cal_unix.c

@@ -35,7 +35,7 @@ PHP_FUNCTION(unixtojd)
 	if (!ts) {
 		ts = time(NULL);
 	} else if (ts < 0) {
-		zend_value_error("timestamp must not be negative");
+		zend_value_error("Timestamp must not be negative");
 		RETURN_THROWS();
 	}
 

ext/calendar/calendar.c

@@ -217,7 +217,7 @@ PHP_FUNCTION(cal_info)
 
 
 	if (cal != -1 && (cal < 0 || cal >= CAL_NUM_CALS)) {
-		zend_value_error("invalid calendar ID " ZEND_LONG_FMT, cal);
+		zend_value_error("Invalid calendar ID: " ZEND_LONG_FMT, cal);
 		RETURN_THROWS();
 	}
 
@@ -239,7 +239,7 @@ PHP_FUNCTION(cal_days_in_month)
 	}
 
 	if (cal < 0 || cal >= CAL_NUM_CALS) {
-		zend_value_error("invalid calendar ID " ZEND_LONG_FMT, cal);
+		zend_value_error("Invalid calendar ID: " ZEND_LONG_FMT, cal);
 		RETURN_THROWS();
 	}
 
@@ -248,7 +248,7 @@ PHP_FUNCTION(cal_days_in_month)
 	sdn_start = calendar->to_jd(year, month, 1);
 
 	if (sdn_start == 0) {
-		zend_value_error("invalid date");
+		zend_value_error("Invalid date");
 		RETURN_THROWS();
 	}
 
@@ -285,7 +285,7 @@ PHP_FUNCTION(cal_to_jd)
 	}
 
 	if (cal < 0 || cal >= CAL_NUM_CALS) {
-		zend_value_error("invalid calendar ID " ZEND_LONG_FMT, cal);
+		zend_value_error("Invalid calendar ID: " ZEND_LONG_FMT, cal);
 		RETURN_THROWS();
 	}
 
@@ -306,7 +306,7 @@ PHP_FUNCTION(cal_from_jd)
 	}
 
 	if (cal < 0 || cal >= CAL_NUM_CALS) {
-		zend_value_error("invalid calendar ID " ZEND_LONG_FMT, cal);
+		zend_value_error("Invalid calendar ID: " ZEND_LONG_FMT, cal);
 		RETURN_THROWS();
 	}
 	calendar = &cal_conversion_table[cal];

ext/calendar/tests/cal_days_in_month_error1.phpt

@@ -18,5 +18,5 @@ try{
 }
 ?>
 --EXPECT--
-invalid calendar ID -1
+Invalid calendar ID: -1
-invalid date
+Invalid date

ext/calendar/tests/cal_from_jd_error1.phpt

@@ -13,4 +13,4 @@ try {
 }
 ?>
 --EXPECT--
-invalid calendar ID -1
+Invalid calendar ID: -1

ext/calendar/tests/cal_info.phpt

@@ -216,4 +216,4 @@ Array
     [calname] => Julian
     [calsymbol] => CAL_JULIAN
 )
-invalid calendar ID 99999
+Invalid calendar ID: 99999

ext/calendar/tests/cal_to_jd_error1.phpt

@@ -13,4 +13,4 @@ try {
 }
 ?>
 --EXPECT--
-invalid calendar ID -1
+Invalid calendar ID: -1

ext/calendar/tests/unixtojd_error1.phpt

@@ -20,7 +20,7 @@ var_dump(unixtojd(null)) . PHP_EOL;
 var_dump(unixtojd(time())) . PHP_EOL;
 ?>
 --EXPECTF--
-timestamp must not be negative
+Timestamp must not be negative
 int(%d)
 int(%d)
 int(%d)

ext/com_dotnet/com_iterator.c

@@ -148,7 +148,7 @@ zend_object_iterator *php_com_iter_get(zend_class_entry *ce, zval *object, int b
 	obj = CDNO_FETCH(object);
 
 	if (V_VT(&obj->v) != VT_DISPATCH && !V_ISARRAY(&obj->v)) {
-		php_error_docref(NULL, E_WARNING, "variant is not an object or array VT=%d", V_VT(&obj->v));
+		php_error_docref(NULL, E_WARNING, "Variant is not an object or array VT=%d", V_VT(&obj->v));
 		return NULL;
 	}
 

ext/curl/interface.c

@@ -1671,7 +1671,7 @@ PHP_FUNCTION(curl_version)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (uversion == CURLVERSION_NOW) {
-		php_error_docref(NULL, E_DEPRECATED, "the $version parameter is deprecated");
+		php_error_docref(NULL, E_DEPRECATED, "The $version parameter is deprecated");
 	} else if (ZEND_NUM_ARGS() > 0) {
 		php_error_docref(NULL, E_WARNING, "$version argument ignored");
 	}
@@ -2576,7 +2576,7 @@ static int _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue) /* {{{
 						ch->handlers->write->method = PHP_CURL_FILE;
 						ZVAL_COPY(&ch->handlers->write->stream, zvalue);
 					} else {
-						php_error_docref(NULL, E_WARNING, "the provided file handle is not writable");
+						php_error_docref(NULL, E_WARNING, "The provided file handle is not writable");
 						return FAILURE;
 					}
 					break;
@@ -2594,7 +2594,7 @@ static int _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue) /* {{{
 						ch->handlers->write_header->method = PHP_CURL_FILE;
 						ZVAL_COPY(&ch->handlers->write_header->stream, zvalue);
 					} else {
-						php_error_docref(NULL, E_WARNING, "the provided file handle is not writable");
+						php_error_docref(NULL, E_WARNING, "The provided file handle is not writable");
 						return FAILURE;
 					}
 					break;
@@ -2623,7 +2623,7 @@ static int _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue) /* {{{
 						zval_ptr_dtor(&ch->handlers->std_err);
 						ZVAL_COPY(&ch->handlers->std_err, zvalue);
 					} else {
-						php_error_docref(NULL, E_WARNING, "the provided file handle is not writable");
+						php_error_docref(NULL, E_WARNING, "The provided file handle is not writable");
 						return FAILURE;
 					}
 					/* break omitted intentionally */

ext/curl/tests/bug48207.phpt

@@ -43,6 +43,6 @@ is_file($tempfile) and @unlink($tempfile);
 isset($tempname) and is_file($tempname) and @unlink($tempname);
 ?>
 --EXPECTF--
-Warning: curl_setopt(): the provided file handle is not writable in %s on line %d
+Warning: curl_setopt(): The provided file handle is not writable in %s on line %d
 Hello World!
 Hello World!

ext/curl/tests/curl_version_error_001.phpt

@@ -10,6 +10,6 @@ curl_version(CURLVERSION_NOW);
 curl_version(0);
 ?>
 --EXPECTF--
-Deprecated: curl_version(): the $version parameter is deprecated in %s on line %d
+Deprecated: curl_version(): The $version parameter is deprecated in %s on line %d
 
 Warning: curl_version(): $version argument ignored in %s on line %d

ext/date/php_date.c

@@ -4642,7 +4642,7 @@ static void php_do_date_sunrise_sunset(INTERNAL_FUNCTION_PARAMETERS, int calc_su
 		case 6:
 			break;
 		default:
-			php_error_docref(NULL, E_WARNING, "invalid format");
+			php_error_docref(NULL, E_WARNING, "Invalid format");
 			RETURN_FALSE;
 			break;
 	}

ext/exif/tests/exif_imagetype_error.phpt

@@ -22,5 +22,5 @@ var_dump( exif_imagetype(__DIR__.'/foo.jpg') );
 
 -- Testing exif_imagetype() function with an unknown file  --
 
-Warning: exif_imagetype(%s/foo.jpg): failed to open stream: No such file or directory in %s on line %d
+Warning: exif_imagetype(%s/foo.jpg): Failed to open stream: No such file or directory in %s on line %d
 bool(false)

ext/ffi/ffi.c

@@ -1009,7 +1009,7 @@ static zval *zend_ffi_cdata_set(zend_object *obj, zend_string *member, zval *val
 #endif
 
 	if (UNEXPECTED(!zend_string_equals_literal(member, "cdata"))) {
-		zend_throw_error(zend_ffi_exception_ce, "only 'cdata' property may be set");
+		zend_throw_error(zend_ffi_exception_ce, "Only 'cdata' property may be set");
 		return &EG(uninitialized_zval);;
 	}
 
@@ -3437,11 +3437,11 @@ static int zend_ffi_validate_incomplete_type(zend_ffi_type *type, zend_bool allo
 			ZEND_HASH_FOREACH_STR_KEY_PTR(FFI_G(tags), key, tag) {
 				if (ZEND_FFI_TYPE(tag->type) == type) {
 					if (type->kind == ZEND_FFI_TYPE_ENUM) {
-						zend_ffi_throw_parser_error("incomplete 'enum %s' at line %d", ZSTR_VAL(key), FFI_G(line));
+						zend_ffi_throw_parser_error("Incomplete 'enum %s' at line %d", ZSTR_VAL(key), FFI_G(line));
 					} else if (type->attr & ZEND_FFI_ATTR_UNION) {
-						zend_ffi_throw_parser_error("incomplete 'union %s' at line %d", ZSTR_VAL(key), FFI_G(line));
+						zend_ffi_throw_parser_error("Incomplete 'union %s' at line %d", ZSTR_VAL(key), FFI_G(line));
 					} else {
-						zend_ffi_throw_parser_error("incomplete 'struct %s' at line %d", ZSTR_VAL(key), FFI_G(line));
+						zend_ffi_throw_parser_error("Incomplete 'struct %s' at line %d", ZSTR_VAL(key), FFI_G(line));
 					}
 					return FAILURE;
 				}
@@ -3453,12 +3453,12 @@ static int zend_ffi_validate_incomplete_type(zend_ffi_type *type, zend_bool allo
 
 			ZEND_HASH_FOREACH_STR_KEY_PTR(FFI_G(symbols), key, sym) {
 				if (type == ZEND_FFI_TYPE(sym->type)) {
-					zend_ffi_throw_parser_error("incomplete C type '%s' at line %d", ZSTR_VAL(key), FFI_G(line));
+					zend_ffi_throw_parser_error("Incomplete C type '%s' at line %d", ZSTR_VAL(key), FFI_G(line));
 					return FAILURE;
 				}
 			} ZEND_HASH_FOREACH_END();
 		}
-		zend_ffi_throw_parser_error("incomplete type at line %d", FFI_G(line));
+		zend_ffi_throw_parser_error("Incomplete type at line %d", FFI_G(line));
 		return FAILURE;
 	} else if (!allow_incomplete_array && type->attr & ZEND_FFI_ATTR_INCOMPLETE_ARRAY) {
 		zend_ffi_throw_parser_error("'[]' not allowed at line %d", FFI_G(line));
@@ -4003,16 +4003,16 @@ ZEND_METHOD(FFI, arrayType) /* {{{ */
 	type = ZEND_FFI_TYPE(ctype->type);
 
 	if (type->kind == ZEND_FFI_TYPE_FUNC) {
-		zend_throw_error(zend_ffi_exception_ce, "array of functions is not allowed");
+		zend_throw_error(zend_ffi_exception_ce, "Array of functions is not allowed");
 		RETURN_THROWS();
 	} else if (type->kind == ZEND_FFI_TYPE_ARRAY && (type->attr & ZEND_FFI_ATTR_INCOMPLETE_ARRAY)) {
-		zend_throw_error(zend_ffi_exception_ce, "only the leftmost array can be undimensioned");
+		zend_throw_error(zend_ffi_exception_ce, "Only the leftmost array can be undimensioned");
 		RETURN_THROWS();
 	} else if (type->kind == ZEND_FFI_TYPE_VOID) {
-		zend_throw_error(zend_ffi_exception_ce, "array of 'void' is not allowed");
+		zend_throw_error(zend_ffi_exception_ce, "Array of 'void' is not allowed");
 		RETURN_THROWS();
 	} else if (type->attr & ZEND_FFI_ATTR_INCOMPLETE_TAG) {
-		zend_throw_error(zend_ffi_exception_ce, "array of incomplete type is not allowed");
+		zend_throw_error(zend_ffi_exception_ce, "Array of incomplete type is not allowed");
 		RETURN_THROWS();
 	}
 
@@ -4189,7 +4189,7 @@ ZEND_METHOD(FFI, memcpy) /* {{{ */
 	} else {
 		ptr1 = cdata1->ptr;
 		if (type1->kind != ZEND_FFI_TYPE_POINTER && size > type1->size) {
-			zend_throw_error(zend_ffi_exception_ce, "attempt to write over data boundary");
+			zend_throw_error(zend_ffi_exception_ce, "Attempt to write over data boundary");
 			RETURN_THROWS();
 		}
 	}
@@ -4198,7 +4198,7 @@ ZEND_METHOD(FFI, memcpy) /* {{{ */
 	if (Z_TYPE_P(zv2) == IS_STRING) {
 		ptr2 = Z_STRVAL_P(zv2);
 		if (size > Z_STRLEN_P(zv2)) {
-			zend_throw_error(zend_ffi_exception_ce, "attempt to read over string boundary");
+			zend_throw_error(zend_ffi_exception_ce, "Attempt to read over string boundary");
 			RETURN_THROWS();
 		}
 	} else if (Z_TYPE_P(zv2) == IS_OBJECT && Z_OBJCE_P(zv2) == zend_ffi_cdata_ce) {
@@ -4209,7 +4209,7 @@ ZEND_METHOD(FFI, memcpy) /* {{{ */
 		} else {
 			ptr2 = cdata2->ptr;
 			if (type2->kind != ZEND_FFI_TYPE_POINTER && size > type2->size) {
-				zend_throw_error(zend_ffi_exception_ce, "attempt to read over data boundary");
+				zend_throw_error(zend_ffi_exception_ce, "Attempt to read over data boundary");
 				RETURN_THROWS();
 			}
 		}
@@ -4266,7 +4266,7 @@ ZEND_METHOD(FFI, memcmp) /* {{{ */
 	if (Z_TYPE_P(zv2) == IS_STRING) {
 		ptr2 = Z_STRVAL_P(zv2);
 		if (size > Z_STRLEN_P(zv2)) {
-			zend_throw_error(zend_ffi_exception_ce, "attempt to read over string boundary");
+			zend_throw_error(zend_ffi_exception_ce, "Attempt to read over string boundary");
 			RETURN_THROWS();
 		}
 	} else if (Z_TYPE_P(zv2) == IS_OBJECT && Z_OBJCE_P(zv2) == zend_ffi_cdata_ce) {
@@ -4277,7 +4277,7 @@ ZEND_METHOD(FFI, memcmp) /* {{{ */
 		} else {
 			ptr2 = cdata2->ptr;
 			if (type2->kind != ZEND_FFI_TYPE_POINTER && size > type2->size) {
-				zend_throw_error(zend_ffi_exception_ce, "attempt to read over data boundary");
+				zend_throw_error(zend_ffi_exception_ce, "Attempt to read over data boundary");
 				RETURN_THROWS();
 			}
 		}
@@ -5512,7 +5512,7 @@ static int zend_ffi_validate_prev_field_type(zend_ffi_type *struct_type) /* {{{
 			break;
 		} ZEND_HASH_FOREACH_END();
 		if (ZEND_FFI_TYPE(field->type)->attr & ZEND_FFI_ATTR_INCOMPLETE_ARRAY) {
-			zend_ffi_throw_parser_error("flexible array member not at end of struct at line %d", FFI_G(line));
+			zend_ffi_throw_parser_error("Flexible array member not at end of struct at line %d", FFI_G(line));
 			return FAILURE;
 		}
 	}
@@ -5523,13 +5523,13 @@ static int zend_ffi_validate_prev_field_type(zend_ffi_type *struct_type) /* {{{
 static int zend_ffi_validate_field_type(zend_ffi_type *type, zend_ffi_type *struct_type) /* {{{ */
 {
 	if (type == struct_type) {
-		zend_ffi_throw_parser_error("struct/union can't contain an instance of itself at line %d", FFI_G(line));
+		zend_ffi_throw_parser_error("Struct/union can't contain an instance of itself at line %d", FFI_G(line));
 		return FAILURE;
 	} else if (zend_ffi_validate_var_type(type, 1) != SUCCESS) {
 		return FAILURE;
 	} else if (struct_type->attr & ZEND_FFI_ATTR_UNION) {
 		if (type->attr & ZEND_FFI_ATTR_INCOMPLETE_ARRAY) {
-			zend_ffi_throw_parser_error("flexible array member in union at line %d", FFI_G(line));
+			zend_ffi_throw_parser_error("Flexible array member in union at line %d", FFI_G(line));
 			return FAILURE;
 		}
 	}
@@ -5789,10 +5789,10 @@ void zend_ffi_make_pointer_type(zend_ffi_dcl *dcl) /* {{{ */
 static int zend_ffi_validate_array_element_type(zend_ffi_type *type) /* {{{ */
 {
 	if (type->kind == ZEND_FFI_TYPE_FUNC) {
-		zend_ffi_throw_parser_error("array of functions is not allowed at line %d", FFI_G(line));
+		zend_ffi_throw_parser_error("Array of functions is not allowed at line %d", FFI_G(line));
 		return FAILURE;
 	} else if (type->kind == ZEND_FFI_TYPE_ARRAY && (type->attr & ZEND_FFI_ATTR_INCOMPLETE_ARRAY)) {
-		zend_ffi_throw_parser_error("only the leftmost array can be undimensioned at line %d", FFI_G(line));
+		zend_ffi_throw_parser_error("Only the leftmost array can be undimensioned at line %d", FFI_G(line));
 		return FAILURE;
 	}
 	return zend_ffi_validate_type(type, 0, 1);
@@ -5849,10 +5849,10 @@ void zend_ffi_make_array_type(zend_ffi_dcl *dcl, zend_ffi_val *len) /* {{{ */
 static int zend_ffi_validate_func_ret_type(zend_ffi_type *type) /* {{{ */
 {
 	if (type->kind == ZEND_FFI_TYPE_FUNC) {
-		zend_ffi_throw_parser_error("function returning function is not allowed at line %d", FFI_G(line));
+		zend_ffi_throw_parser_error("Function returning function is not allowed at line %d", FFI_G(line));
 		return FAILURE;
 	 } else if (type->kind == ZEND_FFI_TYPE_ARRAY) {
-		zend_ffi_throw_parser_error("function returning array is not allowed at line %d", FFI_G(line));
+		zend_ffi_throw_parser_error("Function returning array is not allowed at line %d", FFI_G(line));
 		return FAILURE;
 	}
 	return zend_ffi_validate_incomplete_type(type, 1, 0);
@@ -5986,7 +5986,7 @@ void zend_ffi_make_func_type(zend_ffi_dcl *dcl, HashTable *args, zend_ffi_dcl *n
 			}
 			type->func.args = NULL;
 			_zend_ffi_type_dtor(type);
-			zend_ffi_parser_error("unsupported calling convention line %d", FFI_G(line));
+			zend_ffi_parser_error("Unsupported calling convention line %d", FFI_G(line));
 			break;
 	}
 	type->func.args = args;

ext/ffi/tests/003.phpt

@@ -58,6 +58,6 @@ object(FFI\CData:struct _d)#%d (1) {
   ["x"]=>
   int(0)
 }
-FFI\ParserException: incomplete 'struct _e' at line 1
+FFI\ParserException: Incomplete 'struct _e' at line 1
-FFI\ParserException: incomplete 'struct _f' at line 1
+FFI\ParserException: Incomplete 'struct _f' at line 1
 ok

ext/ffi/tests/004.phpt

@@ -82,6 +82,6 @@ object(FFI\CData:int32_t[2])#%d (2) {
   [1]=>
   int(0)
 }
-FFI\ParserException: incomplete 'enum _e' at line 1
+FFI\ParserException: Incomplete 'enum _e' at line 1
-FFI\ParserException: incomplete 'enum _f' at line 1
+FFI\ParserException: Incomplete 'enum _f' at line 1
 ok

ext/ffi/tests/013.phpt

@@ -59,8 +59,8 @@ int(2)
 int(3)
 FFI\ParserException: 'void' type is not allowed at line 1
 FFI\ParserException: 'void' type is not allowed at line 1
-FFI\ParserException: function returning array is not allowed at line 1
+FFI\ParserException: Function returning array is not allowed at line 1
-FFI\ParserException: array of functions is not allowed at line 1
+FFI\ParserException: Array of functions is not allowed at line 1
-FFI\ParserException: function returning function is not allowed at line 1
+FFI\ParserException: Function returning function is not allowed at line 1
-FFI\ParserException: only the leftmost array can be undimensioned at line 1
+FFI\ParserException: Only the leftmost array can be undimensioned at line 1
 ok

ext/ffi/tests/015.phpt

@@ -57,9 +57,9 @@ try {
 ?>
 ok
 --EXPECT--
-FFI\ParserException: incomplete 'struct DIR' at line 1
+FFI\ParserException: Incomplete 'struct DIR' at line 1
 ok
-FFI\ParserException: incomplete 'struct DIR' at line 1
+FFI\ParserException: Incomplete 'struct DIR' at line 1
 ok
 ok
 ok

ext/ffi/tests/016.phpt

@@ -28,6 +28,6 @@ try {
 ok
 --EXPECT--
 FFI\ParserException: 'function' type is not allowed at line 1
-FFI\ParserException: struct/union can't contain an instance of itself at line 1
+FFI\ParserException: Struct/union can't contain an instance of itself at line 1
 ok
 ok

ext/ffi/tests/017.phpt

@@ -25,7 +25,7 @@ try {
 ok
 --EXPECTF--
 FFI\ParserException: 'function' type is not allowed at line 1
-FFI\ParserException: struct/union can't contain an instance of itself at line 1
+FFI\ParserException: Struct/union can't contain an instance of itself at line 1
 object(FFI\CData:struct X)#%d (1) {
   ["ptr"]=>
   NULL

ext/ffi/tests/018.phpt

@@ -21,6 +21,6 @@ try {
 ?>
 ok
 --EXPECT--
-FFI\ParserException: incomplete 'struct X' at line 1
+FFI\ParserException: Incomplete 'struct X' at line 1
 ok
 ok

ext/ffi/tests/028.phpt

@@ -47,6 +47,6 @@ try {
 ok
 ok
 ok
-FFI\ParserException: flexible array member not at end of struct at line 1
+FFI\ParserException: Flexible array member not at end of struct at line 1
-FFI\ParserException: flexible array member not at end of struct at line 1
+FFI\ParserException: Flexible array member not at end of struct at line 1
-FFI\ParserException: flexible array member in union at line 1
+FFI\ParserException: Flexible array member in union at line 1

ext/fileinfo/tests/bug68996.phpt

@@ -15,8 +15,8 @@ finfo_open(FILEINFO_MIME_TYPE, "\xfc\x63");
 ?>
 --EXPECTF--
 <br />
-<b>Warning</b>:  : failed to open stream: No such file or directory in <b>%sbug68996.php</b> on line <b>%d</b><br />
+<b>Warning</b>:  : Failed to open stream: No such file or directory in <b>%sbug68996.php</b> on line <b>%d</b><br />
 <br />
-<b>Warning</b>:  : failed to open stream: No such file or directory in <b>%sbug68996.php</b> on line <b>%d</b><br />
+<b>Warning</b>:  : Failed to open stream: No such file or directory in <b>%sbug68996.php</b> on line <b>%d</b><br />
 <br />
 <b>Warning</b>:  finfo_open(): Failed to load magic database at '%s<>c'. in <b>%sbug68996.php</b> on line <b>%d</b><br />

ext/fileinfo/tests/finfo_file_001.phpt

@@ -24,5 +24,5 @@ Warning: finfo_file(): Empty filename or path in %s on line %d
 bool(false)
 string(9) "directory"
 
-Warning: finfo_file(&): failed to open stream: No such file or directory in %s on line %d
+Warning: finfo_file(&): Failed to open stream: No such file or directory in %s on line %d
 bool(false)

ext/fileinfo/tests/finfo_open_001.phpt

@@ -23,23 +23,23 @@ finfo_open() expects parameter 2 to be a valid path, string given
 resource(%d) of type (file_info)
 resource(%d) of type (file_info)
 
-Warning: finfo_open(%s123): failed to open stream: No such file or directory in %s on line %d
+Warning: finfo_open(%s123): Failed to open stream: No such file or directory in %s on line %d
 
-Warning: finfo_open(%s123): failed to open stream: No such file or directory in %s on line %d
+Warning: finfo_open(%s123): Failed to open stream: No such file or directory in %s on line %d
 
 Warning: finfo_open(): Failed to load magic database at '%s123'. in %s on line %d
 bool(false)
 
-Warning: finfo_open(%s1): failed to open stream: No such file or directory in %s on line %d
+Warning: finfo_open(%s1): Failed to open stream: No such file or directory in %s on line %d
 
-Warning: finfo_open(%s1): failed to open stream: No such file or directory in %s on line %d
+Warning: finfo_open(%s1): Failed to open stream: No such file or directory in %s on line %d
 
 Warning: finfo_open(): Failed to load magic database at '%s1'. in %s on line %d
 bool(false)
 
-Warning: finfo_open(%sinexistent): failed to open stream: No such file or directory in %s on line %d
+Warning: finfo_open(%sinexistent): Failed to open stream: No such file or directory in %s on line %d
 
-Warning: finfo_open(%sinexistent): failed to open stream: No such file or directory in %s on line %d
+Warning: finfo_open(%sinexistent): Failed to open stream: No such file or directory in %s on line %d
 
 Warning: finfo_open(): Failed to load magic database at '%sinexistent'. in %s on line %d
 bool(false)

ext/fileinfo/tests/finfo_open_error.phpt

@@ -33,9 +33,9 @@ try {
 --EXPECTF--
 *** Testing finfo_open() : error functionality ***
 
-Warning: finfo_open(%sfoobarfile): failed to open stream: No such file or directory in %sfinfo_open_error.php on line %d
+Warning: finfo_open(%sfoobarfile): Failed to open stream: No such file or directory in %sfinfo_open_error.php on line %d
 
-Warning: finfo_open(%sfoobarfile): failed to open stream: No such file or directory in %sfinfo_open_error.php on line %d
+Warning: finfo_open(%sfoobarfile): Failed to open stream: No such file or directory in %sfinfo_open_error.php on line %d
 
 Warning: finfo_open(): Failed to load magic database at '%sfoobarfile'. in %sfinfo_open_error.php on line %d
 bool(false)

ext/fileinfo/tests/mime_content_type_001.phpt

@@ -23,7 +23,7 @@ Warning: mime_content_type(): Can only process string or stream arguments in %s
 
 Warning: mime_content_type(): Can only process string or stream arguments in %s on line %d
 
-Warning: mime_content_type(foo/inexistent): failed to open stream: No such file or directory in %s on line %d
+Warning: mime_content_type(foo/inexistent): Failed to open stream: No such file or directory in %s on line %d
 
 Warning: mime_content_type(): Empty filename or path in %s on line %d
 

ext/filter/logical_filters.c

@@ -360,7 +360,7 @@ void php_filter_float(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
 
 	if (decimal_set) {
 		if (decimal_len != 1) {
-			php_error_docref(NULL, E_WARNING, "decimal separator must be one char");
+			php_error_docref(NULL, E_WARNING, "Decimal separator must be one char");
 			RETURN_VALIDATION_FAILED
 		} else {
 			dec_sep = *decimal;
@@ -371,7 +371,7 @@ void php_filter_float(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
 
 	if (thousand_set) {
 		if (thousand_len < 1) {
-			php_error_docref(NULL, E_WARNING, "thousand separator must be at least one char");
+			php_error_docref(NULL, E_WARNING, "Thousand separator must be at least one char");
 			RETURN_VALIDATION_FAILED
 		} else {
 			tsd_sep = thousand;

ext/filter/tests/031.phpt

@@ -53,6 +53,6 @@ bool(false)
 float(1.234)
 float(1.234)
 
-Warning: filter_var(): decimal separator must be one char in %s on line %d
+Warning: filter_var(): Decimal separator must be one char in %s on line %d
 bool(false)
 bool(false)

ext/filter/tests/bug51368.phpt

@@ -18,5 +18,5 @@ var_dump(filter_var('12345', FILTER_VALIDATE_FLOAT, $options));
 float(1000)
 float(1234.567)
 
-Warning: filter_var(): thousand separator must be at least one char in %s on line %d
+Warning: filter_var(): Thousand separator must be at least one char in %s on line %d
 bool(false)

ext/ftp/ftp.c

@@ -272,7 +272,7 @@ ftp_login(ftpbuf_t *ftp, const char *user, const size_t user_len, const char *pa
 
 		ctx = SSL_CTX_new(SSLv23_client_method());
 		if (ctx == NULL) {
-			php_error_docref(NULL, E_WARNING, "failed to create the SSL context");
+			php_error_docref(NULL, E_WARNING, "Failed to create the SSL context");
 			return 0;
 		}
 
@@ -288,7 +288,7 @@ ftp_login(ftpbuf_t *ftp, const char *user, const size_t user_len, const char *pa
 		SSL_CTX_free(ctx);
 
 		if (ftp->ssl_handle == NULL) {
-			php_error_docref(NULL, E_WARNING, "failed to create the SSL handle");
+			php_error_docref(NULL, E_WARNING, "Failed to create the SSL handle");
 			return 0;
 		}
 

ext/ftp/php_ftp.c

@@ -889,7 +889,7 @@ PHP_FUNCTION(ftp_nb_continue)
 	}
 
 	if (!ftp->nb) {
-		php_error_docref(NULL, E_WARNING, "no nbronous transfer to continue.");
+		php_error_docref(NULL, E_WARNING, "No nbronous transfer to continue.");
 		RETURN_LONG(PHP_FTP_FAILED);
 	}
 

ext/ftp/tests/005.phpt

@@ -66,7 +66,7 @@ int(-1)
 Warning: ftp_mkdir(): Command not implemented (7). in %s005.php on line 20
 bool(false)
 
-Warning: ftp_nb_continue(): no nbronous transfer to continue. in %s005.php on line 21
+Warning: ftp_nb_continue(): No nbronous transfer to continue. in %s005.php on line 21
 int(0)
 
 Warning: ftp_nb_fget(): Mode must be FTP_ASCII or FTP_BINARY in %s005.php on line 22

ext/gd/gd_compat.c

@@ -11,11 +11,11 @@ int overflow2(int a, int b)
 {
 
 	if(a <= 0 || b <= 0) {
-		php_error_docref(NULL, E_WARNING, "one parameter to a memory allocation multiplication is negative or zero, failing operation gracefully\n");
+		php_error_docref(NULL, E_WARNING, "One parameter to a memory allocation multiplication is negative or zero, failing operation gracefully\n");
 		return 1;
 	}
 	if(a > INT_MAX / b) {
-		php_error_docref(NULL, E_WARNING, "product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully\n");
+		php_error_docref(NULL, E_WARNING, "Product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully\n");
 		return 1;
 	}
 	return 0;

ext/gd/libgd/gd_security.c

@@ -21,11 +21,11 @@
 int overflow2(int a, int b)
 {
 	if(a <= 0 || b <= 0) {
-		gd_error("one parameter to a memory allocation multiplication is negative or zero, failing operation gracefully\n");
+		gd_error("One parameter to a memory allocation multiplication is negative or zero, failing operation gracefully\n");
 		return 1;
 	}
 	if(a > INT_MAX / b) {
-		gd_error("product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully\n");
+		gd_error("Product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully\n");
 		return 1;
 	}
 	return 0;

ext/gd/libgd/gd_tga.c

@@ -149,7 +149,7 @@ int read_header_tga(gdIOCtx *ctx, oTga *tga)
 	unsigned char header[18];
 
 	if (gdGetBuf(header, sizeof(header), ctx) < 18) {
-		gd_error("fail to read header");
+		gd_error("Fail to read header");
 		return -1;
 	}
 

ext/gd/libgd/gd_xbm.c

@@ -135,7 +135,7 @@ gdImagePtr gdImageCreateFromXbm(FILE * fd)
 			h[3] = ch;
 		}
 		if (sscanf(h, "%x", &b) != 1) {
-			gd_error("invalid XBM");
+			gd_error("Invalid XBM");
 			gdImageDestroy(im);
 			return 0;
 		}

ext/gd/tests/001-mb.phpt

@@ -17,7 +17,7 @@ var_dump(imagecreatefrompng($file));
 echo "Done\n";
 ?>
 --EXPECTF--
-Warning: imagecreatefrompng(%s001私はガラスを食べられます.test): failed to open stream: No such file or directory in %s on line %d
+Warning: imagecreatefrompng(%s001私はガラスを食べられます.test): Failed to open stream: No such file or directory in %s on line %d
 bool(false)
 
 Warning: imagecreatefrompng(): '%s001私はガラスを食べられます.test' is not a valid PNG file in %s on line %d

ext/gd/tests/001.phpt

@@ -17,7 +17,7 @@ var_dump(imagecreatefrompng($file));
 echo "Done\n";
 ?>
 --EXPECTF--
-Warning: imagecreatefrompng(%s001.test): failed to open stream: No such file or directory in %s on line %d
+Warning: imagecreatefrompng(%s001.test): Failed to open stream: No such file or directory in %s on line %d
 bool(false)
 
 Warning: imagecreatefrompng(): '%s001.test' is not a valid PNG file in %s on line %d

ext/gd/tests/bug66356.phpt

@@ -40,7 +40,7 @@ Array
     [height] => 10
 )
 
-Warning: imagecrop(): one parameter to a memory allocation multiplication is negative or zero, failing operation gracefully
+Warning: imagecrop(): One parameter to a memory allocation multiplication is negative or zero, failing operation gracefully
  in %s on line %d
 bool(false)
 object(GdImage)#2 (0) {
@@ -48,6 +48,6 @@ object(GdImage)#2 (0) {
 object(GdImage)#2 (0) {
 }
 
-Warning: imagecrop(): product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully
+Warning: imagecrop(): Product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully
  in %s on line %d
 bool(false)

ext/gd/tests/bug72339.phpt

@@ -32,7 +32,7 @@ unlink($fname);
 
 ?>
 --EXPECTF--
-Warning: imagecreatefromgd2(): product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully
+Warning: imagecreatefromgd2(): Product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully
  in %sbug72339.php on line %d
 
 Warning: imagecreatefromgd2(): '%sbug72339.gd' is not a valid GD2 file in %sbug72339.php on line %d

ext/gd/tests/bug77269.phpt

@@ -14,5 +14,5 @@ imagescale($im, 1, 1, IMG_TRIANGLE);
 
 ?>
 --EXPECTF--
-Warning: imagescale():%S product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully
+Warning: imagescale():%S Product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully
  in %s on line %d

ext/gd/tests/bug77272.phpt

@@ -14,6 +14,6 @@ $img = imagecreate(2**28, 1);
 var_dump(imagescale($img, 1, 1, IMG_TRIANGLE));
 ?>
 --EXPECTF--
-Warning: imagescale():%S product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully
+Warning: imagescale():%S Product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully
  in %s on line %d
 bool(false)

ext/gd/tests/bug77479.phpt

@@ -14,7 +14,7 @@ imagecolorallocate($im, 0, 0, 0);
 imagewbmp($im, __DIR__ . '/77479.wbmp');
 ?>
 --EXPECTF--
-Warning: imagewbmp():%S product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully
+Warning: imagewbmp():%S Product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully
  in %s on line %d
 
 Warning: imagewbmp(): Could not create WBMP in %s on line %d

ext/gd/tests/bug77973.phpt

@@ -14,7 +14,7 @@ $im = imagecreatefromxbm($filepath);
 var_dump($im);
 ?>
 --EXPECTF--
-Warning: imagecreatefromxbm(): invalid XBM in %s on line %d
+Warning: imagecreatefromxbm(): Invalid XBM in %s on line %d
 
 Warning: imagecreatefromxbm(): '%s' is not a valid XBM file in %s on line %d
 bool(false)

ext/gd/tests/createfromwbmp2.phpt

@@ -42,7 +42,7 @@ $im = imagecreatefromwbmp($filename);
 unlink($filename);
 ?>
 --EXPECTF--
-Warning: imagecreatefromwbmp(): product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully
+Warning: imagecreatefromwbmp(): Product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully
  in %s on line %d
 
 Warning: imagecreatefromwbmp(): '%s' is not a valid WBMP file in %s on line %d

ext/gd/tests/createfromwbmp2_extern.phpt

@@ -42,6 +42,6 @@ $im = imagecreatefromwbmp($filename);
 unlink($filename);
 ?>
 --EXPECTF--
-gd warning: product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully
+gd warning: Product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully
 
 Warning: imagecreatefromwbmp(): '%s_tmp.wbmp' is not a valid WBMP file in %s on line %d

ext/gd/tests/imageloadfont_error2.phpt

@@ -11,5 +11,5 @@ Austin Drouare <austin.drouare [at] gmail [dot] com> #testfest #tek11
 var_dump( imageloadfont('\src\invalidfile.font') );
 ?>
 --EXPECTF--
-Warning: imageloadfont(\src\invalidfile.font): failed to open stream: No such file or directory in %s on line %d
+Warning: imageloadfont(\src\invalidfile.font): Failed to open stream: No such file or directory in %s on line %d
 bool(false)

ext/gd/tests/imageloadfont_invalid.phpt

@@ -19,7 +19,7 @@ imagestring($image, $font, 0, 0, "Hello", $black);
 unlink($filename);
 ?>
 --EXPECTF--
-Warning: imageloadfont(): product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully
+Warning: imageloadfont(): Product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully
  in %simageloadfont_invalid.php on line %d
 
 Warning: imageloadfont(): Error reading font, invalid font header in %simageloadfont_invalid.php on line %d

ext/gd/tests/libgd00101.phpt

@@ -11,7 +11,7 @@ $im = imagecreatefromgd(__DIR__ . '/libgd00101.gd');
 var_dump($im);
 ?>
 --EXPECTF--
-Warning: imagecreatefromgd(): product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully
+Warning: imagecreatefromgd(): Product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully
  in %slibgd00101.php on line %d
 
 Warning: imagecreatefromgd(): '%slibgd00101.gd' is not a valid GD file in %slibgd00101.php on line %d

ext/gettext/gettext.c

@@ -77,7 +77,7 @@ ZEND_GET_MODULE(php_gettext)
 
 #define PHP_GETTEXT_DOMAIN_LENGTH_CHECK(domain_len) \
 	if (UNEXPECTED(domain_len > PHP_GETTEXT_MAX_DOMAIN_LENGTH)) { \
-		php_error_docref(NULL, E_WARNING, "domain passed too long"); \
+		php_error_docref(NULL, E_WARNING, "Domain passed too long"); \
 		RETURN_FALSE; \
 	}
 

ext/gettext/tests/44938.phpt

@@ -36,10 +36,10 @@ var_dump(dgettext($domain, $overflown));
 var_dump(textdomain($overflown));
 ?>
 --EXPECTF--
-Warning: bindtextdomain(): domain passed too long in %s on line %d
+Warning: bindtextdomain(): Domain passed too long in %s on line %d
 bool(false)
 
-Warning: dngettext(): domain passed too long in %s on line %d
+Warning: dngettext(): Domain passed too long in %s on line %d
 bool(false)
 
 Warning: dngettext(): msgid1 passed too long in %s on line %d
@@ -57,13 +57,13 @@ bool(false)
 Warning: ngettext(): msgid2 passed too long in %s on line %d
 bool(false)
 
-Warning: dcgettext(): domain passed too long in %s on line %d
+Warning: dcgettext(): Domain passed too long in %s on line %d
 bool(false)
 
 Warning: dcgettext(): msgid passed too long in %s on line %d
 bool(false)
 
-Warning: dcngettext(): domain passed too long in %s on line %d
+Warning: dcngettext(): Domain passed too long in %s on line %d
 bool(false)
 
 Warning: dcngettext(): msgid1 passed too long in %s on line %d
@@ -72,11 +72,11 @@ bool(false)
 Warning: dcngettext(): msgid2 passed too long in %s on line %d
 bool(false)
 
-Warning: dgettext(): domain passed too long in %s on line %d
+Warning: dgettext(): Domain passed too long in %s on line %d
 bool(false)
 
 Warning: dgettext(): msgid passed too long in %s on line %d
 bool(false)
 
-Warning: textdomain(): domain passed too long in %s on line %d
+Warning: textdomain(): Domain passed too long in %s on line %d
 bool(false)

ext/hash/hash.c

@@ -1065,7 +1065,7 @@ PHP_FUNCTION(mhash_keygen_s2k)
 
 	bytes = (int)l_bytes;
 	if (bytes <= 0){
-		php_error_docref(NULL, E_WARNING, "the byte parameter must be greater than 0");
+		php_error_docref(NULL, E_WARNING, "The byte parameter must be greater than 0");
 		RETURN_FALSE;
 	}
 

ext/hash/tests/hash_file_error.phpt

@@ -42,5 +42,5 @@ bool(false)
 
 -- Testing hash_file() function with a non-existent file --
 
-Warning: hash_file(%s): failed to open stream: No such file or directory in %s on line %d
+Warning: hash_file(%s): Failed to open stream: No such file or directory in %s on line %d
 bool(false)

ext/iconv/tests/iconv_stream_filter_delimiter.phpt

@@ -44,7 +44,7 @@ string(20) "a4b3a4f3a4cba4c1a4cf"
 string(10) "69636f6e76"
 string(2) "0a"
 
-Warning: stream_filter_append(): unable to create or locate filter "convert.iconv.ISO-2022-JP\0EUC-JP" in %siconv_stream_filter_delimiter.php on line %d
+Warning: stream_filter_append(): Unable to create or locate filter "convert.iconv.ISO-2022-JP\0EUC-JP" in %siconv_stream_filter_delimiter.php on line %d
 string(20) "1b244224332473244b24"
 string(10) "41244f1b28"
 string(2) "42"

ext/imap/php_imap.c

@@ -992,7 +992,7 @@ PHP_FUNCTION(imap_append)
 			0, Z_L(0), Z_L(0));
 
 		if (!Z_LVAL_P(return_value)) {
-			php_error_docref(NULL, E_WARNING, "internal date not correctly formatted");
+			php_error_docref(NULL, E_WARNING, "Internal date not correctly formatted");
 			internal_date = NULL;
 		}
 	}
@@ -1091,7 +1091,7 @@ PHP_FUNCTION(imap_get_quota)
 	/* set the callback for the GET_QUOTA function */
 	mail_parameters(NIL, SET_QUOTA, (void *) mail_getquota);
 	if (!imap_getquota(imap_le_struct->imap_stream, ZSTR_VAL(qroot))) {
-		php_error_docref(NULL, E_WARNING, "c-client imap_getquota failed");
+		php_error_docref(NULL, E_WARNING, "C-client imap_getquota failed");
 		zend_array_destroy(Z_ARR_P(return_value));
 		RETURN_FALSE;
 	}
@@ -1120,7 +1120,7 @@ PHP_FUNCTION(imap_get_quotaroot)
 	/* set the callback for the GET_QUOTAROOT function */
 	mail_parameters(NIL, SET_QUOTA, (void *) mail_getquota);
 	if (!imap_getquotaroot(imap_le_struct->imap_stream, ZSTR_VAL(mbox))) {
-		php_error_docref(NULL, E_WARNING, "c-client imap_getquotaroot failed");
+		php_error_docref(NULL, E_WARNING, "C-client imap_getquotaroot failed");
 		zend_array_destroy(Z_ARR_P(return_value));
 		RETURN_FALSE;
 	}
@@ -1241,7 +1241,7 @@ PHP_FUNCTION(imap_gc)
 	}
 
 	if (flags && ((flags & ~(GC_TEXTS | GC_ELT | GC_ENV)) != 0)) {
-		php_error_docref(NULL, E_WARNING, "invalid value for the flags parameter");
+		php_error_docref(NULL, E_WARNING, "Invalid value for the flags parameter");
 		RETURN_FALSE;
 	}
 
@@ -1277,7 +1277,7 @@ PHP_FUNCTION(imap_close)
 
 		/* Check that flags is exactly equal to PHP_EXPUNGE or zero */
 		if (flags && ((flags & ~PHP_EXPUNGE) != 0)) {
-			php_error_docref(NULL, E_WARNING, "invalid value for the flags parameter");
+			php_error_docref(NULL, E_WARNING, "Invalid value for the flags parameter");
 			RETURN_FALSE;
 		}
 
@@ -1363,7 +1363,7 @@ PHP_FUNCTION(imap_body)
 	}
 
 	if (flags && ((flags & ~(FT_UID|FT_PEEK|FT_INTERNAL)) != 0)) {
-		php_error_docref(NULL, E_WARNING, "invalid value for the options parameter");
+		php_error_docref(NULL, E_WARNING, "Invalid value for the options parameter");
 		RETURN_FALSE;
 	}
 
@@ -1989,7 +1989,7 @@ PHP_FUNCTION(imap_fetchstructure)
 	}
 
 	if (flags && ((flags & ~FT_UID) != 0)) {
-		php_error_docref(NULL, E_WARNING, "invalid value for the options parameter");
+		php_error_docref(NULL, E_WARNING, "Invalid value for the options parameter");
 		RETURN_FALSE;
 	}
 
@@ -2041,7 +2041,7 @@ PHP_FUNCTION(imap_fetchbody)
 	}
 
 	if (flags && ((flags & ~(FT_UID|FT_PEEK|FT_INTERNAL)) != 0)) {
-		php_error_docref(NULL, E_WARNING, "invalid value for the options parameter");
+		php_error_docref(NULL, E_WARNING, "Invalid value for the options parameter");
 		RETURN_FALSE;
 	}
 
@@ -2083,7 +2083,7 @@ PHP_FUNCTION(imap_fetchmime)
 	}
 
 	if (flags && ((flags & ~(FT_UID|FT_PEEK|FT_INTERNAL)) != 0)) {
-		php_error_docref(NULL, E_WARNING, "invalid value for the options parameter");
+		php_error_docref(NULL, E_WARNING, "Invalid value for the options parameter");
 		RETURN_FALSE;
 	}
 
@@ -2860,7 +2860,7 @@ PHP_FUNCTION(imap_fetchheader)
 	}
 
 	if (flags && ((flags & ~(FT_UID|FT_INTERNAL|FT_PREFETCHTEXT)) != 0)) {
-		php_error_docref(NULL, E_WARNING, "invalid value for the options parameter");
+		php_error_docref(NULL, E_WARNING, "Invalid value for the options parameter");
 		RETURN_FALSE;
 	}
 
@@ -3102,7 +3102,7 @@ PHP_FUNCTION(imap_fetch_overview)
 	}
 
 	if (flags && ((flags & ~FT_UID) != 0)) {
-		php_error_docref(NULL, E_WARNING, "invalid value for the options parameter");
+		php_error_docref(NULL, E_WARNING, "Invalid value for the options parameter");
 		RETURN_FALSE;
 	}
 
@@ -3460,7 +3460,7 @@ PHP_FUNCTION(imap_mail_compose)
 	}
 
 	if (bod && bod->type == TYPEMULTIPART && (!bod->nested.part || !bod->nested.part->next)) {
-		php_error_docref(NULL, E_WARNING, "cannot generate multipart e-mail without components.");
+		php_error_docref(NULL, E_WARNING, "Cannot generate multipart e-mail without components.");
 		RETVAL_FALSE;
 		goto done;
 	}

ext/imap/tests/bug75774.phpt

@@ -21,6 +21,6 @@ unlink($fn);
 
 ?>
 --EXPECTF--
-Warning: imap_append(): internal date not correctly formatted in %s on line %d
+Warning: imap_append(): Internal date not correctly formatted in %s on line %d
 
-Exception: imap_append(): supplied resource is not a valid imap resource
+Exception: imap_append(): Supplied resource is not a valid imap resource

ext/imap/tests/imap_body.phpt

@@ -42,7 +42,7 @@ Warning: imap_body() expects at least 2 parameters, 1 given in %s on line %d
 
 Warning: imap_body(): Bad message number in %s on line %d
 
-Warning: imap_body(): invalid value for the options parameter in %s on line %d
+Warning: imap_body(): Invalid value for the options parameter in %s on line %d
 
 Warning: imap_body(): Bad message number in %s on line %d
 bool(false)

ext/imap/tests/imap_close_variation4.phpt

@@ -77,15 +77,15 @@ CL_EXPUNGE was set
 
 -- Iteration 3 --
 
-Warning: imap_close(): invalid value for the flags parameter in %s on line %d
+Warning: imap_close(): Invalid value for the flags parameter in %s on line %d
 bool(false)
 
 -- Iteration 4 --
 
-Warning: imap_close(): invalid value for the flags parameter in %s on line %d
+Warning: imap_close(): Invalid value for the flags parameter in %s on line %d
 bool(false)
 
 -- Iteration 5 --
 
-Warning: imap_close(): invalid value for the flags parameter in %s on line %d
+Warning: imap_close(): Invalid value for the flags parameter in %s on line %d
 bool(false)

ext/imap/tests/imap_fetch_overview_variation3.phpt

@@ -71,8 +71,8 @@ imap_fetch_overview() returns an object
 
 Testing with option value:int(%d)
 
-Warning: imap_fetch_overview(): invalid value for the options parameter in %s on line %d
+Warning: imap_fetch_overview(): Invalid value for the options parameter in %s on line %d
 
 Testing with option value:int(-%d)
 
-Warning: imap_fetch_overview(): invalid value for the options parameter in %s on line %d
+Warning: imap_fetch_overview(): Invalid value for the options parameter in %s on line %d

ext/imap/tests/imap_fetchbody_variation4.phpt

@@ -68,10 +68,10 @@ FT_UID valid
 
 -- Iteration 5 --
 
-Warning: imap_fetchbody(): invalid value for the options parameter in %s on line %d
+Warning: imap_fetchbody(): Invalid value for the options parameter in %s on line %d
 FT_UID not valid
 
 -- Iteration 6 --
 
-Warning: imap_fetchbody(): invalid value for the options parameter in %s on line %d
+Warning: imap_fetchbody(): Invalid value for the options parameter in %s on line %d
 FT_UID not valid

ext/imap/tests/imap_fetchheader_variation3.phpt

@@ -66,10 +66,10 @@ FT_UID valid
 
 -- Iteration 5 --
 
-Warning: imap_fetchheader(): invalid value for the options parameter in %s on line %d
+Warning: imap_fetchheader(): Invalid value for the options parameter in %s on line %d
 FT_UID not valid
 
 -- Iteration 6 --
 
-Warning: imap_fetchheader(): invalid value for the options parameter in %s on line %d
+Warning: imap_fetchheader(): Invalid value for the options parameter in %s on line %d
 FT_UID not valid

ext/imap/tests/imap_gc_error.phpt

@@ -25,11 +25,11 @@ imap_gc($stream_id, -1);
 --EXPECTF--
 Checking with no parameters
 
-Warning: imap_gc() expects exactly 2 parameters, 0 given in %s on line %d
+Warning: imap_gc() Expects exactly 2 parameters, 0 given in %s on line %d
 Checking with incorrect parameter type
 
-Warning: imap_gc() expects parameter 1 to be resource, string given in %s on line %d
+Warning: imap_gc() Expects parameter 1 to be resource, string given in %s on line %d
 
-Warning: imap_gc() expects parameter 1 to be resource, bool given in %s on line %d
+Warning: imap_gc() Expects parameter 1 to be resource, bool given in %s on line %d
 
-Warning: imap_gc(): invalid value for the flags parameter in %s on line %d
+Warning: imap_gc(): Invalid value for the flags parameter in %s on line %d

ext/intl/dateformat/dateformat_helpers.cpp

@@ -51,7 +51,7 @@ int datefmt_process_calendar_arg(zval* calendar_zv,
 
 		zend_long v = Z_LVAL_P(calendar_zv);
 		if (v != (zend_long)UCAL_TRADITIONAL && v != (zend_long)UCAL_GREGORIAN) {
-			spprintf(&msg, 0, "%s: invalid value for calendar type; it must be "
+			spprintf(&msg, 0, "%s: Invalid value for calendar type; it must be "
 					"one of IntlDateFormatter::TRADITIONAL (locale's default "
 					"calendar) or IntlDateFormatter::GREGORIAN. "
 					"Alternatively, it can be an IntlCalendar object",

ext/intl/tests/dateformat___construct_bad_tz_cal.phpt

@@ -31,8 +31,8 @@ try {
 }
 ?>
 --EXPECTF--
-Exception: IntlDateFormatter::__construct(): datefmt_create: no such time zone: 'bad timezone' in %s on line %d
+Exception: IntlDateFormatter::__construct(): datefmt_create: No such time zone: 'bad timezone' in %s on line %d
 
-Exception: IntlDateFormatter::__construct(): datefmt_create: invalid value for calendar type; it must be one of IntlDateFormatter::TRADITIONAL (locale's default calendar) or IntlDateFormatter::GREGORIAN. Alternatively, it can be an IntlCalendar object in %s on line %d
+Exception: IntlDateFormatter::__construct(): datefmt_create: Invalid value for calendar type; it must be one of IntlDateFormatter::TRADITIONAL (locale's default calendar) or IntlDateFormatter::GREGORIAN. Alternatively, it can be an IntlCalendar object in %s on line %d
 
 Exception: IntlDateFormatter::__construct(): datefmt_create: Invalid calendar argument; should be an integer or an IntlCalendar instance in %s on line %d

ext/intl/tests/dateformat_calendars.phpt

@@ -41,7 +41,7 @@ string(44) "Sunday, January 1, 2012 5:12:00 AM GMT+05:12"
 string(44) "Sunday, January 1, 2012 5:12:00 AM GMT+05:12"
 string(42) "Sunday, Tevet 6, 5772 5:12:00 AM GMT+05:12"
 
-Fatal error: Uncaught IntlException: IntlDateFormatter::__construct(): datefmt_create: invalid value for calendar type; it must be one of IntlDateFormatter::TRADITIONAL (locale's default calendar) or IntlDateFormatter::GREGORIAN. Alternatively, it can be an IntlCalendar object in %sdateformat_calendars.php:%d
+Fatal error: Uncaught IntlException: IntlDateFormatter::__construct(): datefmt_create: Invalid value for calendar type; it must be one of IntlDateFormatter::TRADITIONAL (locale's default calendar) or IntlDateFormatter::GREGORIAN. Alternatively, it can be an IntlCalendar object in %sdateformat_calendars.php:%d
 Stack trace:
 #0 %sdateformat_calendars.php(%d): IntlDateFormatter->__construct('en_US@calendar=...', 0, 0, 'GMT+05:12', -1)
 #1 {main}

ext/intl/tests/dateformat_calendars_variant2.phpt

@@ -42,7 +42,7 @@ string(47) "Sunday, January 1, 2012 at 5:12:00 AM GMT+05:12"
 string(47) "Sunday, January 1, 2012 at 5:12:00 AM GMT+05:12"
 string(48) "Sunday, Tevet 6, 5772 AM at 5:12:00 AM GMT+05:12"
 
-Fatal error: Uncaught IntlException: IntlDateFormatter::__construct(): datefmt_create: invalid value for calendar type; it must be one of IntlDateFormatter::TRADITIONAL (locale's default calendar) or IntlDateFormatter::GREGORIAN. Alternatively, it can be an IntlCalendar object in %sdateformat_calendars_variant2.php:27
+Fatal error: Uncaught IntlException: IntlDateFormatter::__construct(): datefmt_create: Invalid value for calendar type; it must be one of IntlDateFormatter::TRADITIONAL (locale's default calendar) or IntlDateFormatter::GREGORIAN. Alternatively, it can be an IntlCalendar object in %sdateformat_calendars_variant2.php:27
 Stack trace:
 #0 %sdateformat_calendars_variant2.php(27): IntlDateFormatter->__construct('en_US@calendar=...', 0, 0, 'GMT+05:12', -1)
 #1 {main}

ext/intl/tests/dateformat_calendars_variant3.phpt

@@ -41,7 +41,7 @@ string(47) "Sunday, January 1, 2012 at 5:12:00 AM GMT+05:12"
 string(47) "Sunday, January 1, 2012 at 5:12:00 AM GMT+05:12"
 string(44) "Sunday, 6 Tevet 5772 at 5:12:00 AM GMT+05:12"
 
-Fatal error: Uncaught IntlException: IntlDateFormatter::__construct(): datefmt_create: invalid value for calendar type; it must be one of IntlDateFormatter::TRADITIONAL (locale's default calendar) or IntlDateFormatter::GREGORIAN. Alternatively, it can be an IntlCalendar object in %sdateformat_calendars_variant3.php:27
+Fatal error: Uncaught IntlException: IntlDateFormatter::__construct(): datefmt_create: Invalid value for calendar type; it must be one of IntlDateFormatter::TRADITIONAL (locale's default calendar) or IntlDateFormatter::GREGORIAN. Alternatively, it can be an IntlCalendar object in %sdateformat_calendars_variant3.php:27
 Stack trace:
 #0 %sdateformat_calendars_variant3.php(%d): IntlDateFormatter->__construct('en_US@calendar=...', 0, 0, 'GMT+05:12', -1)
 #1 {main}

ext/intl/tests/dateformat_setTimeZone_error.phpt

@@ -19,8 +19,8 @@ var_dump($df->setTimeZone('non existing timezone'));
 --EXPECTF--
 Warning: Array to string conversion in %s on line %d
 
-Warning: IntlDateFormatter::setTimeZone(): datefmt_set_timezone: no such time zone: 'Array' in %s on line %d
+Warning: IntlDateFormatter::setTimeZone(): datefmt_set_timezone: No such time zone: 'Array' in %s on line %d
 bool(false)
 
-Warning: IntlDateFormatter::setTimeZone(): datefmt_set_timezone: no such time zone: 'non existing timezone' in %s on line %d
+Warning: IntlDateFormatter::setTimeZone(): datefmt_set_timezone: No such time zone: 'non existing timezone' in %s on line %d
 bool(false)

ext/intl/tests/dateformat_set_timezone_id2.phpt

@@ -57,9 +57,9 @@ include_once( 'ut_common.inc' );
 ut_run();
 ?>
 --EXPECTF--
-Warning: IntlDateFormatter::setTimeZone(): datefmt_set_timezone: no such time zone: 'CN' in %s on line %d
+Warning: IntlDateFormatter::setTimeZone(): datefmt_set_timezone: No such time zone: 'CN' in %s on line %d
 
-Warning: datefmt_set_timezone(): datefmt_set_timezone: no such time zone: 'CN' in %s on line %d
+Warning: datefmt_set_timezone(): datefmt_set_timezone: No such time zone: 'CN' in %s on line %d
 
 After creation of the dateformatter :  timezone_id= US/Pacific
 -----------

ext/intl/tests/dateformat_set_timezone_id3.phpt

@@ -57,9 +57,9 @@ include_once( 'ut_common.inc' );
 ut_run();
 ?>
 --EXPECTF--
-Warning: IntlDateFormatter::setTimeZone(): datefmt_set_timezone: no such time zone: 'CN' in %sut_common.inc on line %d
+Warning: IntlDateFormatter::setTimeZone(): datefmt_set_timezone: No such time zone: 'CN' in %sut_common.inc on line %d
 
-Warning: datefmt_set_timezone(): datefmt_set_timezone: no such time zone: 'CN' in %sut_common.inc on line %d
+Warning: datefmt_set_timezone(): datefmt_set_timezone: No such time zone: 'CN' in %sut_common.inc on line %d
 
 After creation of the dateformatter :  timezone_id= US/Pacific
 -----------

ext/intl/timezone/timezone_class.cpp

@@ -195,7 +195,7 @@ U_CFUNC TimeZone *timezone_process_timezone_argument(zval *zv_timezone,
 		}
 		timeZone = TimeZone::createTimeZone(id);
 		if (timeZone == NULL) {
-			spprintf(&message, 0, "%s: could not create time zone", func);
+			spprintf(&message, 0, "%s: Could not create time zone", func);
 			if (message) {
 				intl_errors_set(outside_error, U_MEMORY_ALLOCATION_ERROR, message, 1);
 				efree(message);
@@ -204,7 +204,7 @@ U_CFUNC TimeZone *timezone_process_timezone_argument(zval *zv_timezone,
 			return NULL;
 		}
 		if (timeZone->getID(gottenId) != id) {
-			spprintf(&message, 0, "%s: no such time zone: '%s'",
+			spprintf(&message, 0, "%s: No such time zone: '%s'",
 				func, Z_STRVAL_P(zv_timezone));
 			if (message) {
 				intl_errors_set(outside_error, U_ILLEGAL_ARGUMENT_ERROR, message, 1);

ext/ldap/ldap.c

@@ -1030,7 +1030,7 @@ PHP_FUNCTION(ldap_connect)
 
 			if (port <= 0 || port > 65535) {
 				efree(ld);
-				php_error_docref(NULL, E_WARNING, "invalid port number: " ZEND_LONG_FMT, port);
+				php_error_docref(NULL, E_WARNING, "Invalid port number: " ZEND_LONG_FMT, port);
 				RETURN_FALSE;
 			}
 
@@ -1968,7 +1968,7 @@ PHP_FUNCTION(ldap_next_attribute)
 	}
 
 	if (resultentry->ber == NULL) {
-		php_error_docref(NULL, E_WARNING, "called before calling ldap_first_attribute() or no attributes found in result entry");
+		php_error_docref(NULL, E_WARNING, "Called before calling ldap_first_attribute() or no attributes found in result entry");
 		RETURN_FALSE;
 	}
 
@@ -3894,7 +3894,7 @@ static void php_ldap_do_translate(INTERNAL_FUNCTION_PARAMETERS, int way)
 		RETVAL_STRINGL(value, value_len);
 		free(value);
 	} else {
-		php_error_docref(NULL, E_WARNING, "Conversion from iso-8859-1 to t61 failed: %s", ldap_err2string(result));
+		php_error_docref(NULL, E_WARNING, "Conversion from ISO-8859-1 to t61 failed: %s", ldap_err2string(result));
 		RETVAL_FALSE;
 	}
 }

ext/ldap/tests/ldap_next_attribute_error.phpt

@@ -26,5 +26,5 @@ $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
 remove_dummy_data($link, $base);
 ?>
 --EXPECTF--
-Warning: ldap_next_attribute(): called before calling ldap_first_attribute() or no attributes found in result entry in %s on line %d
+Warning: ldap_next_attribute(): Called before calling ldap_first_attribute() or no attributes found in result entry in %s on line %d
 bool(false)

ext/libxml/tests/bug61367-write.phpt

@@ -42,5 +42,5 @@ bool(true)
 
 Warning: DOMDocument::save(): open_basedir restriction in effect. File(%s) is not within the allowed path(s): (.) in %s on line %d
 
-Warning: DOMDocument::save(%s): failed to open stream: Operation not permitted in %s on line %d
+Warning: DOMDocument::save(%s): Failed to open stream: Operation not permitted in %s on line %d
 bool(false)

ext/mbstring/php_mbregex.c

@@ -921,7 +921,7 @@ static void _php_mb_regex_ereg_exec(INTERNAL_FUNCTION_PARAMETERS, int icase)
 	}
 
 	if (arg_pattern_len == 0) {
-		php_error_docref(NULL, E_WARNING, "empty pattern");
+		php_error_docref(NULL, E_WARNING, "Empty pattern");
 		RETVAL_FALSE;
 		goto out;
 	}

ext/mbstring/tests/bug43994.phpt

@@ -41,11 +41,11 @@ foreach($inputs as $input) {
 -- Iteration 1 --
 Without $regs arg:
 
-Warning: mb_ereg(): empty pattern in %s on line %d
+Warning: mb_ereg(): Empty pattern in %s on line %d
 bool(false)
 With $regs arg:
 
-Warning: mb_ereg(): empty pattern in %s on line %d
+Warning: mb_ereg(): Empty pattern in %s on line %d
 bool(false)
 array(0) {
 }
@@ -53,11 +53,11 @@ array(0) {
 -- Iteration 2 --
 Without $regs arg:
 
-Warning: mb_ereg(): empty pattern in %s on line %d
+Warning: mb_ereg(): Empty pattern in %s on line %d
 bool(false)
 With $regs arg:
 
-Warning: mb_ereg(): empty pattern in %s on line %d
+Warning: mb_ereg(): Empty pattern in %s on line %d
 bool(false)
 array(0) {
 }
@@ -65,11 +65,11 @@ array(0) {
 -- Iteration 3 --
 Without $regs arg:
 
-Warning: mb_ereg(): empty pattern in %s on line %d
+Warning: mb_ereg(): Empty pattern in %s on line %d
 bool(false)
 With $regs arg:
 
-Warning: mb_ereg(): empty pattern in %s on line %d
+Warning: mb_ereg(): Empty pattern in %s on line %d
 bool(false)
 array(0) {
 }
@@ -77,11 +77,11 @@ array(0) {
 -- Iteration 4 --
 Without $regs arg:
 
-Warning: mb_ereg(): empty pattern in %s on line %d
+Warning: mb_ereg(): Empty pattern in %s on line %d
 bool(false)
 With $regs arg:
 
-Warning: mb_ereg(): empty pattern in %s on line %d
+Warning: mb_ereg(): Empty pattern in %s on line %d
 bool(false)
 array(0) {
 }
@@ -89,11 +89,11 @@ array(0) {
 -- Iteration 5 --
 Without $regs arg:
 
-Warning: mb_ereg(): empty pattern in %s on line %d
+Warning: mb_ereg(): Empty pattern in %s on line %d
 bool(false)
 With $regs arg:
 
-Warning: mb_ereg(): empty pattern in %s on line %d
+Warning: mb_ereg(): Empty pattern in %s on line %d
 bool(false)
 array(0) {
 }
@@ -101,11 +101,11 @@ array(0) {
 -- Iteration 6 --
 Without $regs arg:
 
-Warning: mb_ereg(): empty pattern in %s on line %d
+Warning: mb_ereg(): Empty pattern in %s on line %d
 bool(false)
 With $regs arg:
 
-Warning: mb_ereg(): empty pattern in %s on line %d
+Warning: mb_ereg(): Empty pattern in %s on line %d
 bool(false)
 array(0) {
 }
@@ -113,11 +113,11 @@ array(0) {
 -- Iteration 7 --
 Without $regs arg:
 
-Warning: mb_ereg(): empty pattern in %s on line %d
+Warning: mb_ereg(): Empty pattern in %s on line %d
 bool(false)
 With $regs arg:
 
-Warning: mb_ereg(): empty pattern in %s on line %d
+Warning: mb_ereg(): Empty pattern in %s on line %d
 bool(false)
 array(0) {
 }
@@ -125,11 +125,11 @@ array(0) {
 -- Iteration 8 --
 Without $regs arg:
 
-Warning: mb_ereg(): empty pattern in %s on line %d
+Warning: mb_ereg(): Empty pattern in %s on line %d
 bool(false)
 With $regs arg:
 
-Warning: mb_ereg(): empty pattern in %s on line %d
+Warning: mb_ereg(): Empty pattern in %s on line %d
 bool(false)
 array(0) {
 }

ext/mbstring/tests/mb_ereg1.phpt

@@ -34,7 +34,7 @@ array(3) {
   }
 }
 
-Warning: mb_ereg(): empty pattern in %s on line %d
+Warning: mb_ereg(): Empty pattern in %s on line %d
 bool(false)
 array(3) {
   [0]=>

ext/mysqli/mysqli_api.c

@@ -2342,7 +2342,7 @@ PHP_FUNCTION(mysqli_stmt_attr_set)
 	MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_VALID);
 
 	if (mode_in < 0) {
-		php_error_docref(NULL, E_WARNING, "mode should be non-negative, " ZEND_LONG_FMT " passed", mode_in);
+		php_error_docref(NULL, E_WARNING, "Mode should be non-negative, " ZEND_LONG_FMT " passed", mode_in);
 		RETURN_FALSE;
 	}
 

ext/mysqli/mysqli_warning.c

@@ -288,7 +288,7 @@ PHP_METHOD(mysqli_warning, __construct)
 			RETURN_FALSE;
 		}
 	} else {
-		php_error_docref(NULL, E_WARNING, "invalid class argument");
+		php_error_docref(NULL, E_WARNING, "Invalid class argument");
 		RETURN_FALSE;
 	}
 

ext/mysqli/tests/mysqli_class_mysqli_warning.phpt

@@ -108,7 +108,7 @@ Warning: mysqli_warning::mysqli_warning(): invalid object or resource mysqli_stm
 Warning: mysqli_warning::mysqli_warning(): invalid object or resource mysqli_stmt
  in %s on line %d
 
-Warning: mysqli_warning::mysqli_warning(): invalid class argument in /home/nixnutz/php6_mysqlnd/ext/mysqli/tests/mysqli_class_mysqli_warning.php on line 19
+Warning: mysqli_warning::mysqli_warning(): Invalid class argument in /home/nixnutz/php6_mysqlnd/ext/mysqli/tests/mysqli_class_mysqli_warning.php on line 19
 
 Warning: mysqli_warning::mysqli_warning(): No warnings found in %s on line %d
 Parent class:

ext/mysqli/tests/mysqli_pam_sha256_public_key_option_invalid.phpt

@@ -181,7 +181,7 @@ Warning: mysqli::real_connect(): (HY000/1045): %s in %s on line %d
 Warning: mysqli::real_connect(): (HY000/1045): %s in %s on line %d
 [300 + 002] [1045] %s
 
-Warning: mysqli::real_connect(%sest_sha256_wrong_%d): failed to open stream: No such file or directory in %s on line %d
+Warning: mysqli::real_connect(%sest_sha256_wrong_%d): Failed to open stream: No such file or directory in %s on line %d
 
 Warning: mysqli::real_connect(): (HY000/1045): %s in %s on line %d
 [400 + 002] [1045] %s

ext/mysqlnd/mysqlnd_connection.c

@@ -2641,7 +2641,7 @@ mysqlnd_poll(MYSQLND **r_array, MYSQLND **e_array, MYSQLND ***dont_poll, long se
 	retval = php_select(max_fd + 1, &rfds, &wfds, &efds, tv_p);
 
 	if (retval == -1) {
-		php_error_docref(NULL, E_WARNING, "unable to select [%d]: %s (max_fd=%d)",
+		php_error_docref(NULL, E_WARNING, "Unable to select [%d]: %s (max_fd=%d)",
 						errno, strerror(errno), max_fd);
 		DBG_RETURN(FAIL);
 	}

ext/oci8/oci8.c

@@ -1538,7 +1538,7 @@ sb4 php_oci_error(OCIError *err_p, sword errstatus)
 			if (errcode) {
 				php_error_docref(NULL, E_WARNING, "%s", errbuf);
 			} else {
-				php_error_docref(NULL, E_WARNING, "failed to fetch error message");
+				php_error_docref(NULL, E_WARNING, "Failed to fetch error message");
 			}
 			break;
 		case OCI_INVALID_HANDLE: