Move custom type checks to ZPP

Author: kocsismate

ext/mbstring/mbstring.c

@@ -3495,8 +3495,8 @@ PHP_FUNCTION(mb_send_mail)
 	size_t message_len;
 	char *subject;
 	size_t subject_len;
-	zval *headers = NULL;
 	zend_string *extra_cmd = NULL;
+	HashTable *headers_ht = NULL;
 	zend_string *str_headers = NULL, *tmp_headers;
 	size_t n, i;
 	char *to_r = NULL;
@@ -3537,30 +3537,29 @@ PHP_FUNCTION(mb_send_mail)
 		body_enc = mbfl_no2encoding(lang->mail_body_encoding);
 	}
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "sss|z!S!", &to, &to_len, &subject, &subject_len, &message, &message_len, &headers, &extra_cmd) == FAILURE) {
-		RETURN_THROWS();
-	}
+	ZEND_PARSE_PARAMETERS_START(3, 5)
+		Z_PARAM_STRING(to, to_len)
+		Z_PARAM_STRING(subject, subject_len)
+		Z_PARAM_STRING(message, message_len)
+		Z_PARAM_OPTIONAL
+		Z_PARAM_STR_OR_ARRAY_HT_OR_NULL(str_headers, headers_ht)
+		Z_PARAM_STR_OR_NULL(extra_cmd)
+	ZEND_PARSE_PARAMETERS_END();
 
 	/* ASCIIZ check */
 	MAIL_ASCIIZ_CHECK_MBSTRING(to, to_len);
 	MAIL_ASCIIZ_CHECK_MBSTRING(subject, subject_len);
 	MAIL_ASCIIZ_CHECK_MBSTRING(message, message_len);
-	if (headers) {
-		switch(Z_TYPE_P(headers)) {
-			case IS_STRING:
-				tmp_headers = zend_string_init(Z_STRVAL_P(headers), Z_STRLEN_P(headers), 0);
-				MAIL_ASCIIZ_CHECK_MBSTRING(ZSTR_VAL(tmp_headers), ZSTR_LEN(tmp_headers));
-				str_headers = php_trim(tmp_headers, NULL, 0, 2);
-				zend_string_release_ex(tmp_headers, 0);
-				break;
-			case IS_ARRAY:
-				str_headers = php_mail_build_headers(Z_ARRVAL_P(headers));
-				break;
-			default:
-				zend_argument_value_error(4, "must be of type string|array|null, %s given", zend_zval_type_name(headers));
-				RETURN_THROWS();
-		}
+
+	if (str_headers) {
+		tmp_headers = zend_string_init(ZSTR_VAL(str_headers), ZSTR_LEN(str_headers), 0);
+		MAIL_ASCIIZ_CHECK_MBSTRING(ZSTR_VAL(tmp_headers), ZSTR_LEN(tmp_headers));
+		str_headers = php_trim(tmp_headers, NULL, 0, 2);
+		zend_string_release_ex(tmp_headers, 0);
+	} else if (headers_ht) {
+		str_headers = php_mail_build_headers(headers_ht);
 	}
+
 	if (extra_cmd) {
 		MAIL_ASCIIZ_CHECK_MBSTRING(ZSTR_VAL(extra_cmd), ZSTR_LEN(extra_cmd));
 	}

ext/mbstring/mbstring.stub.php

@@ -77,8 +77,7 @@ function mb_encode_numericentity(string $string, array $convmap, ?string $encodi
 
 function mb_decode_numericentity(string $string, array $convmap, ?string $encoding = null): string {}
 
-/** @param string|array|null $additional_headers */
-function mb_send_mail(string $to, string $subject, string $message, $additional_headers = null, ?string $additional_parameters = null): bool {}
+function mb_send_mail(string $to, string $subject, string $message, array|string|null $additional_headers = null, ?string $additional_parameters = null): bool {}
 
 function mb_get_info(string $type = "all"): array|string|int|false {}
 

ext/mbstring/mbstring_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 5ad8a8cf20eeae59713d19135ecccbee243754eb */
+ * Stub hash: 84096daa0fd395f57401f11e9e79f7c8420e8a93 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mb_language, 0, 0, MAY_BE_STRING|MAY_BE_BOOL)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, language, IS_STRING, 1, "null")
@@ -178,7 +178,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mb_send_mail, 0, 3, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, to, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, subject, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0)
-	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, additional_headers, "null")
+	ZEND_ARG_TYPE_MASK(0, additional_headers, MAY_BE_ARRAY|MAY_BE_STRING|MAY_BE_NULL, "null")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, additional_parameters, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 

ext/mysqli/mysqli.stub.php

@@ -237,18 +237,16 @@ public function select_db(string $database) {}
     public function set_charset(string $charset) {}
 
     /**
-     * @param string|int $value
      * @return bool
      * @alias mysqli_options
      */
-    public function options(int $option, $value) {}
+    public function options(int $option, string|int $value) {}
 
     /**
-     * @param string|int $value
      * @return bool
      * @alias mysqli_options
      */
-    public function set_opt(int $option, $value) {}
+    public function set_opt(int $option, string|int $value) {}
 
     /**
      * @return bool
@@ -630,8 +628,7 @@ function mysqli_num_fields(mysqli_result $mysql_result): int {}
 
 function mysqli_num_rows(mysqli_result $mysqli_result): int|string {}
 
-/** @param string|int $value */
-function mysqli_options(mysqli $mysqli_link, int $option, $value): bool {}
+function mysqli_options(mysqli $mysqli_link, int $option, string|int $value): bool {}
 
 function mysqli_ping(mysqli $mysqli_link): bool {}
 
@@ -752,8 +749,5 @@ function mysqli_refresh(mysqli $mysqli_link, int $options): bool {}
 /** @alias mysqli_real_escape_string */
 function mysqli_escape_string(mysqli $mysqli_link, string $string_to_escape): string {}
 
-/**
- * @param string|int $value
- * @alias mysqli_options
- */
-function mysqli_set_opt(mysqli $mysqli_link, int $option, $value): bool {}
+/** @alias mysqli_options */
+function mysqli_set_opt(mysqli $mysqli_link, int $option, string|int $value): bool {}

ext/mysqli/mysqli_api.c

@@ -1679,15 +1679,18 @@ PHP_FUNCTION(mysqli_options)
 {
 	MY_MYSQL		*mysql;
 	zval			*mysql_link = NULL;
-	zval			*mysql_value;
+	zend_string		*mysql_value_str;
+	zend_long		mysql_value_long;
 	zend_long			mysql_option;
-	unsigned int	l_value;
 	zend_long			ret;
 	int				expected_type;
 
-	if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Olz", &mysql_link, mysqli_link_class_entry, &mysql_option, &mysql_value) == FAILURE) {
-		RETURN_THROWS();
-	}
+	ZEND_PARSE_PARAMETERS_START(3, 3)
+		Z_PARAM_OBJECT_OF_CLASS(mysql_link, mysqli_link_class_entry)
+		Z_PARAM_LONG(mysql_option)
+		Z_PARAM_STR_OR_LONG(mysql_value_str, mysql_value_long)
+	ZEND_PARSE_PARAMETERS_END();
+
 	MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_INITIALIZED);
 
 #ifndef MYSQLI_USE_MYSQLND
@@ -1698,31 +1701,20 @@ PHP_FUNCTION(mysqli_options)
 	}
 #endif
 	expected_type = mysqli_options_get_option_zval_type(mysql_option);
-	if (expected_type != Z_TYPE_P(mysql_value)) {
-		switch (expected_type) {
-			case IS_STRING:
-				if (!try_convert_to_string(mysql_value)) {
-					RETURN_THROWS();
-				}
-				break;
-			case IS_LONG:
-				convert_to_long_ex(mysql_value);
-				break;
-			default:
-				break;
+	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();
 		}
-	}
-	switch (expected_type) {
-		case IS_STRING:
-			ret = mysql_options(mysql->mysql, mysql_option, Z_STRVAL_P(mysql_value));
-			break;
-		case IS_LONG:
-			l_value = Z_LVAL_P(mysql_value);
-			ret = mysql_options(mysql->mysql, mysql_option, (char *)&l_value);
-			break;
-		default:
-			ret = 1;
-			break;
+		ret = mysql_options(mysql->mysql, mysql_option, ZSTR_VAL(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();
+		}
+		ret = mysql_options(mysql->mysql, mysql_option, (char *) &mysql_value_long);
+	} else if (expected_type == IS_NULL) {
+		ret = 1;
 	}
 
 	RETURN_BOOL(!ret);

ext/mysqli/mysqli_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: a8626c7c42e4d117b08df7f42a7523f60f357b82 */
+ * Stub hash: 5695d494cc9a1f780e65c525c47e047780bf80f1 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mysqli_affected_rows, 0, 1, MAY_BE_LONG|MAY_BE_STRING)
 	ZEND_ARG_OBJ_INFO(0, mysql_link, mysqli, 0)
@@ -208,7 +208,7 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_options, 0, 3, _IS_BOOL, 0)
 	ZEND_ARG_OBJ_INFO(0, mysqli_link, mysqli, 0)
 	ZEND_ARG_TYPE_INFO(0, option, IS_LONG, 0)
-	ZEND_ARG_INFO(0, value)
+	ZEND_ARG_TYPE_MASK(0, value, MAY_BE_STRING|MAY_BE_LONG, NULL)
 ZEND_END_ARG_INFO()
 
 #define arginfo_mysqli_ping arginfo_mysqli_more_results
@@ -545,7 +545,7 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_mysqli_options, 0, 0, 2)
 	ZEND_ARG_TYPE_INFO(0, option, IS_LONG, 0)
-	ZEND_ARG_INFO(0, value)
+	ZEND_ARG_TYPE_MASK(0, value, MAY_BE_STRING|MAY_BE_LONG, NULL)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_mysqli_set_opt arginfo_class_mysqli_options

ext/oci8/oci8.stub.php

@@ -277,7 +277,7 @@ function oci_fetch_all($statement_resource, &$output, int $skip = 0, int $maximu
 
 /**
  * @param resource $statement_resource
- * @param mixed $output
+ * @param array $output
  * @alias oci_fetch_all
  * @deprecated
  */

ext/oci8/oci8_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 1c1a73f6a4de5fa2ca9595125822d65bc4f5fc55 */
+ * Stub hash: 2ed91ce6711e5f6c0f0ba5ab4ca3d93af05fe497 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_define_by_name, 0, 3, _IS_BOOL, 0)
 	ZEND_ARG_INFO(0, statement_resource)

ext/odbc/odbc.stub.php

@@ -57,11 +57,8 @@ function odbc_fetch_into($result_id, &$result_array, int $rownumber = 0): int|fa
 /** @param resource $result_id */
 function odbc_fetch_row($result_id, int $row_number = UNKNOWN): bool {}
 
-/**
- * @param resource $result_id
- * @param string|int $field
- */
-function odbc_result($result_id, $field): string|bool|null {}
+/** @param resource $result_id */
+function odbc_result($result_id, string|int $field): string|bool|null {}
 
 /** @param resource $result_id */
 function odbc_result_all($result_id, string $format = ''): int|false {}

ext/odbc/odbc_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 14702a5bd87902871d456de2289f4ae236e5bfa5 */
+ * Stub hash: cf17952d8c3b88f218bbb8d1c21ba40079574c04 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_odbc_close_all, 0, 0, IS_VOID, 0)
 ZEND_END_ARG_INFO()
@@ -70,7 +70,7 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_odbc_result, 0, 2, MAY_BE_STRING|MAY_BE_BOOL|MAY_BE_NULL)
 	ZEND_ARG_INFO(0, result_id)
-	ZEND_ARG_INFO(0, field)
+	ZEND_ARG_TYPE_MASK(0, field, MAY_BE_STRING|MAY_BE_LONG, NULL)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_odbc_result_all, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)