Address review comments

* Fix callback in test
* Use appropriate error types
* Check for long type
* Get rid of else branch

Author: nielsdos

ext/curl/interface.c

@@ -801,14 +801,16 @@ static int curl_ssh_hostkeyfunction(void *clientp, int keytype, const char *key,
 		php_error_docref(NULL, E_WARNING, "Cannot call the CURLOPT_SSH_HOSTKEYFUNCTION");
 	} else if (!Z_ISUNDEF(retval)) {
 		_php_curl_verify_handlers(ch, /* reporterror */ true);
-		zend_long retval_long = zval_get_long(&retval);
-		if (retval_long == CURLKHMATCH_OK || retval_long == CURLKHMATCH_MISMATCH) {
-			rval = retval_long;
+		if (Z_TYPE(retval) == IS_LONG) {
+			zend_long retval_long = zval_get_long(&retval);
+			if (retval_long == CURLKHMATCH_OK || retval_long == CURLKHMATCH_MISMATCH) {
+				rval = retval_long;
+			} else {
+				zend_throw_error(NULL, "The CURLOPT_SSH_HOSTKEYFUNCTION callback must return either CURLKHMATCH_OK or CURLKHMATCH_MISMATCH");
+			}
 		} else {
-			zend_value_error("The CURLOPT_SSH_HOSTKEYFUNCTION callback must return either CURLKHMATCH_OK or CURLKHMATCH_MISMATCH");
+			zend_type_error("The CURLOPT_SSH_HOSTKEYFUNCTION callback must return an integer");
 		}
-	} else {
-		zend_value_error("The CURLOPT_SSH_HOSTKEYFUNCTION callback must return a return code");
 	}
 	zval_ptr_dtor(&argv[0]);
 	zval_ptr_dtor(&argv[2]);

ext/curl/tests/curl_basic_027.phpt

@@ -21,7 +21,7 @@ $host = curl_cli_server_start();
 $url = "{$host}/get.inc?test=";
 curl_setopt($ch, CURLOPT_URL, $url);
 curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-var_dump(curl_setopt($ch, CURLOPT_SSH_HOSTKEYFUNCTION, function ($keytype, $key, $keylen) {
+var_dump(curl_setopt($ch, CURLOPT_SSH_HOSTKEYFUNCTION, function ($ch, $keytype, $key, $keylen) {
     // Can't really trigger this in a test
     var_dump($keytype);
     var_dump($key);