Address code review

Author: kocsismate

Zend/zend_operators.c

@@ -816,7 +816,7 @@ ZEND_API zend_long ZEND_FASTCALL zval_get_long_func(zval *op) /* {{{ */
 				} else {
 					/* Previously we used strtol here, not is_numeric_string,
 					 * and strtol gives you LONG_MAX/_MIN on overflow.
-					 * We use use saturating conversion to emulate strtol()'s
+					 * We use saturating conversion to emulate strtol()'s
 					 * behaviour.
 					 */
 					 return zend_dval_to_lval_cap(dval);

ext/mysqli/mysqli_api.c

@@ -1707,14 +1707,24 @@ PHP_FUNCTION(mysqli_options)
 	expected_type = mysqli_options_get_option_zval_type(mysql_option);
 	if (expected_type == IS_STRING) {
 		if (!mysql_value_str) {
-			zend_argument_type_error(3, "must be of type string for the chosen option");
-			RETURN_THROWS();
+			mysql_value_str = zend_long_to_str(mysql_value_long);
 		}
 		ret = mysql_options(mysql->mysql, mysql_option, ZSTR_VAL(mysql_value_str));
+
+		zend_string_release(mysql_value_str);
 	} else if (expected_type == IS_LONG) {
 		if (mysql_value_str) {
-			zend_argument_type_error(3, "must be of type int for the chosen option");
-			RETURN_THROWS();
+			double rv;
+			zend_long lv;
+			zend_uchar type;
+
+			type = is_numeric_string(ZSTR_VAL(mysql_value_str), ZSTR_LEN(mysql_value_str), &lv, &rv, 0);
+			if (type == IS_LONG) {
+				mysql_value_long = lv;
+			} else {
+				zend_argument_type_error(getThis() ? 1 : 2, "must be a numeric string for the chosen option");
+				RETURN_THROWS();
+			}
 		}
 		ret = mysql_options(mysql->mysql, mysql_option, (char *) &mysql_value_long);
 	} else {