Address code review comments

Author: kocsismate

ext/hash/hash.c

@@ -137,7 +137,7 @@ static void php_hash_do_hash(INTERNAL_FUNCTION_PARAMETERS, int isfilename, zend_
 	}
 	if (isfilename) {
 		if (CHECK_NULL_PATH(data, data_len)) {
-			zend_argument_value_error(1, "must be a valid path");
+			zend_argument_type_error(1, "must be a valid path");
 			RETURN_THROWS();
 		}
 		stream = php_stream_open_wrapper_ex(data, "rb", REPORT_ERRORS, NULL, FG(default_context));
@@ -254,18 +254,14 @@ static void php_hash_do_hash_hmac(INTERNAL_FUNCTION_PARAMETERS, int isfilename,
 	}
 
 	ops = php_hash_fetch_ops(algo);
-	if (!ops) {
-		zend_argument_value_error(1, "must be a valid hashing algorithm");
-		RETURN_THROWS();
-	}
-	else if (!ops->is_crypto) {
-		zend_argument_value_error(1, "must be a cryptographic hashing algorithm");
+	if (!ops || !ops->is_crypto) {
+		zend_argument_value_error(1, "must be a valid cryptographic hashing algorithm");
 		RETURN_THROWS();
 	}
 
 	if (isfilename) {
 		if (CHECK_NULL_PATH(data, data_len)) {
-			zend_argument_value_error(2, "must be a valid path");
+			zend_argument_type_error(2, "must be a valid path");
 			RETURN_THROWS();
 		}
 		stream = php_stream_open_wrapper_ex(data, "rb", REPORT_ERRORS, NULL, FG(default_context));
@@ -367,7 +363,7 @@ PHP_FUNCTION(hash_init)
 
 	if (options & PHP_HASH_HMAC) {
 		if (!ops->is_crypto) {
-			zend_argument_value_error(2, "must not request HMAC with a non-cryptographic hashing algorithm");
+			zend_argument_value_error(1, "must be a cryptographic hashing algorithm if HMAC is requested");
 			RETURN_THROWS();
 		}
 		if (!key || (ZSTR_LEN(key) == 0)) {
@@ -649,13 +645,8 @@ PHP_FUNCTION(hash_hkdf)
 	}
 
 	ops = php_hash_fetch_ops(algo);
-	if (!ops) {
-		zend_argument_value_error(1, "must be a valid hashing algorithm");
-		RETURN_THROWS();
-	}
-
-	if (!ops->is_crypto) {
-		zend_argument_value_error(1, "must be a cryptographic hashing algorithm");
+	if (!ops || !ops->is_crypto) {
+		zend_argument_value_error(1, "must be a valid cryptographic hashing algorithm");
 		RETURN_THROWS();
 	}
 
@@ -749,12 +740,8 @@ PHP_FUNCTION(hash_pbkdf2)
 	}
 
 	ops = php_hash_fetch_ops(algo);
-	if (!ops) {
-		zend_argument_value_error(1, "must be a valid hashing algorithm");
-		RETURN_THROWS();
-	}
-	else if (!ops->is_crypto) {
-		zend_argument_value_error(1, "must be a cryptographic hashing algorithm");
+	if (!ops || !ops->is_crypto) {
+		zend_argument_value_error(1, "must be a valid cryptographic hashing algorithm");
 		RETURN_THROWS();
 	}
 

ext/hash/tests/hash_hkdf_error.phpt

@@ -53,7 +53,7 @@ trycatch_dump(
 *** Testing hash_hkdf(): error conditions ***
 
 -- Testing hash_hkdf() function with invalid hash algorithm --
-[ValueError] hash_hkdf(): Argument #1 ($algo) must be a valid hashing algorithm
+[ValueError] hash_hkdf(): Argument #1 ($algo) must be a valid cryptographic hashing algorithm
 
 -- Testing hash_hkdf() function with non-cryptographic hash algorithm --
 [ValueError] hash_hkdf(): Argument #1 ($algo) must be a cryptographic hashing algorithm

ext/hash/tests/hash_hmac_error.phpt

@@ -33,7 +33,7 @@ catch (\Error $e) {
 *** Testing hash_hmac() : error conditions ***
 
 -- Testing hash_hmac() function with invalid hash algorithm --
-hash_hmac(): Argument #1 ($algo) must be a valid hashing algorithm
+hash_hmac(): Argument #1 ($algo) must be a valid cryptographic hashing algorithm
 
 -- Testing hash_hmac() function with non-cryptographic hash algorithm --
 hash_hmac(): Argument #1 ($algo) must be a cryptographic hashing algorithm

ext/hash/tests/hash_hmac_file_error.phpt

@@ -34,7 +34,7 @@ echo "\n-- Testing hash_hmac_file() function with bad path --\n";
 try {
     var_dump(hash_hmac_file('md5', $file.chr(0).$file, $key, TRUE));
 }
-catch (\Error $e) {
+catch (TypeError $e) {
     echo $e->getMessage() . "\n";
 }
 
@@ -43,7 +43,7 @@ catch (\Error $e) {
 *** Testing hash() : error conditions ***
 
 -- Testing hash_hmac_file() function with invalid hash algorithm --
-hash_hmac_file(): Argument #1 ($algo) must be a valid hashing algorithm
+hash_hmac_file(): Argument #1 ($algo) must be a valid cryptographic hashing algorithm
 
 -- Testing hash_hmac_file() function with non-cryptographic hash algorithm --
 hash_hmac_file(): Argument #1 ($algo) must be a cryptographic hashing algorithm

ext/hash/tests/hash_init_error.phpt

@@ -44,7 +44,7 @@ catch (\Error $e) {
 hash_init(): Argument #1 ($algo) must be a valid hashing algorithm
 
 -- Testing hash_init() function with HASH_HMAC and non-cryptographic algorithms --
-hash_init(): Argument #2 ($options) must not request HMAC with a non-cryptographic hashing algorithm
+hash_init(): Argument #2 ($options) must be a cryptographic hashing algorithm if HMAC is requested
 
 -- Testing hash_init() function with HASH_HMAC and no key --
 hash_init(): Argument #3 ($key) cannot be empty when HMAC is requested

ext/hash/tests/hash_pbkdf2_error.phpt

@@ -57,7 +57,7 @@ catch (\Error $e) {
 *** Testing hash_pbkdf2() : error conditions ***
 
 -- Testing hash_pbkdf2() function with invalid hash algorithm --
-hash_pbkdf2(): Argument #1 ($algo) must be a valid hashing algorithm
+hash_pbkdf2(): Argument #1 ($algo) must be a valid cryptographic hashing algorithm
 
 -- Testing hash_pbkdf2() function with non-cryptographic hash algorithm --
 hash_pbkdf2(): Argument #1 ($algo) must be a cryptographic hashing algorithm