Make type and value error messages more consistent

Author: kocsismate

ext/standard/filestat.c

@@ -353,7 +353,7 @@ static void php_do_chgrp(INTERNAL_FUNCTION_PARAMETERS, int do_lchgrp) /* {{{ */
 				option = PHP_STREAM_META_GROUP_NAME;
 				value = Z_STRVAL_P(group);
 			} else {
-				zend_type_error("Parameter 2 should be string or int, %s given", zend_zval_type_name(group));
+				zend_type_error("Argument 2 must be string|int, %s given", zend_zval_type_name(group));
 				RETURN_THROWS();
 			}
 			if(wrapper->wops->stream_metadata(wrapper, filename, option, value, NULL)) {
@@ -382,7 +382,7 @@ static void php_do_chgrp(INTERNAL_FUNCTION_PARAMETERS, int do_lchgrp) /* {{{ */
 			RETURN_FALSE;
 		}
 	} else {
-		zend_type_error("Parameter 2 should be string or int, %s given", zend_zval_type_name(group));
+		zend_type_error("Argument 2 must be string|int, %s given", zend_zval_type_name(group));
 		RETURN_THROWS();
 	}
 

ext/standard/random.c

@@ -205,7 +205,7 @@ PHP_FUNCTION(random_bytes)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (size < 1) {
-		zend_throw_exception(zend_ce_error, "Length must be greater than 0", 0);
+		zend_throw_exception_ex(zend_ce_error, 0, "Argument 1 must be greater than 0, " ZEND_LONG_FMT " given", size);
 		RETURN_THROWS();
 	}
 

ext/standard/string.c

@@ -1276,15 +1276,15 @@ PHP_FUNCTION(implode)
 
 	if (pieces == NULL) {
 		if (arg1_array == NULL) {
-			zend_type_error("Argument must be an array");
+			zend_type_error("Argument must be of the type array, string given");
 			RETURN_THROWS();
 		}
 
 		arg1_str = ZSTR_EMPTY_ALLOC();
 		pieces = arg1_array;
 	} else {
 		if (arg1_str == NULL) {
-			zend_type_error("The first argument must be a string");
+			zend_type_error("Argument 1 must be of the type string, array given");
 			RETURN_THROWS();
 		}
 	}

ext/standard/var.c

@@ -1240,7 +1240,7 @@ PHP_FUNCTION(unserialize)
 		max_depth = zend_hash_str_find_deref(Z_ARRVAL_P(options), "max_depth", sizeof("max_depth") - 1);
 		if (max_depth) {
 			if (Z_TYPE_P(max_depth) != IS_LONG) {
-				zend_type_error("max_depth should be int");
+				zend_type_error("The \"max_depth\" option must be of the type int, %s given", zend_zval_type_name(max_depth));
 				goto cleanup;
 			}
 			if (Z_LVAL_P(max_depth) < 0) {