Improve a last couple of argument error messages

Closes GH-5404

Author: kocsismate

ext/dba/dba.c

@@ -107,7 +107,7 @@ static size_t php_dba_make_key(zval *key, char **key_str, char **key_free)
 		size_t len;
 
 		if (zend_hash_num_elements(Z_ARRVAL_P(key)) != 2) {
-			zend_throw_error(NULL, "Key does not have exactly two elements: (key, name)");
+			zend_argument_error(NULL, 1, "must have exactly two elements: 'key' and 'name'");
 			return 0;
 		}
 		zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(key), &pos);

ext/dba/tests/dba013.phpt

@@ -24,7 +24,7 @@ require(__DIR__ .'/clean.inc');
 --EXPECTF--
 database handler: %s
 
-Fatal error: Uncaught Error: Key does not have exactly two elements: (key, name) in %sdba013.php:6
+Fatal error: Uncaught Error: dba_insert(): Argument #1 ($key) must have exactly two elements: 'key' and 'name' in %s.php:%d
 Stack trace:
 #0 %sdba013.php(6): dba_insert(Array, '%s', Resource id #%d)
 #1 {main}

ext/dba/tests/dba014.phpt

@@ -24,7 +24,7 @@ require(__DIR__ .'/clean.inc');
 --EXPECTF--
 database handler: %s
 
-Fatal error: Uncaught Error: Key does not have exactly two elements: (key, name) in %sdba014.php:6
+Fatal error: Uncaught Error: dba_insert(): Argument #1 ($key) must have exactly two elements: 'key' and 'name' in %s.php:%d
 Stack trace:
 #0 %sdba014.php(6): dba_insert(Array, '%s', Resource id #%d)
 #1 {main}

ext/dom/document.c

@@ -2082,7 +2082,7 @@ PHP_METHOD(DOMDocument, registerNodeClass)
 		RETURN_TRUE;
 	}
 
-	zend_throw_error(NULL, "Class %s is not derived from %s.", ZSTR_VAL(ce->name), ZSTR_VAL(basece->name));
+	zend_argument_error(NULL, 2, "must be a class name derived from %s or null, '%s' given", ZSTR_VAL(basece->name), ZSTR_VAL(ce->name));
 }
 /* }}} */
 

ext/ffi/ffi.c

@@ -993,7 +993,7 @@ static zval *zend_ffi_cdata_get(zend_object *obj, zend_string *member, int read_
 #endif
 
 	if (UNEXPECTED(!zend_string_equals_literal(member, "cdata"))) {
-		zend_throw_error(zend_ffi_exception_ce, "only 'cdata' property may be read");
+		zend_throw_error(zend_ffi_exception_ce, "Only 'cdata' property may be read");
 		return &EG(uninitialized_zval);;
 	}
 

ext/hash/hash.c

@@ -410,9 +410,9 @@ PHP_FUNCTION(hash_init)
 }
 /* }}} */
 
-#define PHP_HASHCONTEXT_VERIFY(func, hash) { \
+#define PHP_HASHCONTEXT_VERIFY(hash) { \
 	if (!hash->context) { \
-		zend_throw_error(NULL, "%s(): supplied resource is not a valid Hash Context resource", func); \
+		zend_argument_type_error(1, "must be a valid Hash Context resource"); \
 		RETURN_THROWS(); \
 	} \
 }
@@ -430,7 +430,7 @@ PHP_FUNCTION(hash_update)
 	}
 
 	hash = php_hashcontext_from_object(Z_OBJ_P(zhash));
-	PHP_HASHCONTEXT_VERIFY("hash_update", hash);
+	PHP_HASHCONTEXT_VERIFY(hash);
 	hash->ops->hash_update(hash->context, (unsigned char *) ZSTR_VAL(data), ZSTR_LEN(data));
 
 	RETURN_TRUE;
@@ -451,7 +451,7 @@ PHP_FUNCTION(hash_update_stream)
 	}
 
 	hash = php_hashcontext_from_object(Z_OBJ_P(zhash));
-	PHP_HASHCONTEXT_VERIFY("hash_update_stream", hash);
+	PHP_HASHCONTEXT_VERIFY(hash);
 	php_stream_from_zval(stream, zstream);
 
 	while (length) {
@@ -492,7 +492,7 @@ PHP_FUNCTION(hash_update_file)
 	}
 
 	hash = php_hashcontext_from_object(Z_OBJ_P(zhash));
-	PHP_HASHCONTEXT_VERIFY("hash_update_file", hash);
+	PHP_HASHCONTEXT_VERIFY(hash);
 	context = php_stream_context_from_zval(zcontext, 0);
 
 	stream = php_stream_open_wrapper_ex(ZSTR_VAL(filename), "rb", REPORT_ERRORS, NULL, context);
@@ -525,7 +525,7 @@ PHP_FUNCTION(hash_final)
 	}
 
 	hash = php_hashcontext_from_object(Z_OBJ_P(zhash));
-	PHP_HASHCONTEXT_VERIFY("hash_final", hash);
+	PHP_HASHCONTEXT_VERIFY(hash);
 
 	digest_len = hash->ops->digest_size;
 	digest = zend_string_alloc(digest_len, 0);

ext/hash/tests/reuse.phpt

@@ -13,4 +13,4 @@ catch (\Error $e) {
 }
 
 --EXPECT--
-hash_update(): supplied resource is not a valid Hash Context resource
+hash_update(): Argument #1 ($context) must be a valid Hash Context resource

ext/mbstring/mbstring.c

@@ -3333,7 +3333,7 @@ php_mb_numericentity_exec(INTERNAL_FUNCTION_PARAMETERS, int type)
 	/* conversion map */
 	i = zend_hash_num_elements(target_hash);
 	if (i % 4 != 0) {
-		zend_value_error("count($convmap) must be a multiple of 4");
+		zend_argument_value_error(2, "must have a multiple of 4 elements");
 		RETURN_THROWS();
 	}
 	convmap = (int *)safe_emalloc(i, sizeof(int), 0);

ext/mbstring/tests/mb_decode_numericentity.phpt

@@ -42,4 +42,4 @@ aŒbœcŠdše€fg
 &#100000000000
 &#000000000000
 föo
-count($convmap) must be a multiple of 4
+mb_decode_numericentity(): Argument #2 ($convmap) must have a multiple of 4 elements

ext/mbstring/tests/mb_encode_numericentity.phpt

@@ -31,4 +31,4 @@ try {
 ƒΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩαβγδεζηθικλμνξοπρςστυφχψωϑϒϖ•…′″‾⁄℘ℑℜ™ℵ←↑→↓↔↵⇐⇑⇒⇓⇔∀∂∃∅∇∈∉∋∏∑−∗√∝∞∠∧∨∩∪∫∴∼≅≈≠≡≤≥⊂⊃⊄⊆⊇⊕⊗⊥⋅⌈⌉⌊⌋〈〉◊♠♣♥♦
 aŒbœcŠdše€fg
 föo
-count($convmap) must be a multiple of 4
+mb_encode_numericentity(): Argument #2 ($convmap) must have a multiple of 4 elements