Fix default values in ext/filter

kocsismate · kocsismate · commit 4281daaaddb6 · 2020-09-12T20:44:45.000+02:00
diff --git a/ext/filter/filter.c b/ext/filter/filter.c
@@ -525,14 +525,14 @@ PHP_FUNCTION(filter_has_var)
 /* }}} */
 
 static void php_filter_call(
-	zval *filtered, zend_long filter, HashTable *filter_args_ht, zend_long filter_args_long, zend_bool filter_args_is_null,
+	zval *filtered, zend_long filter, HashTable *filter_args_ht, zend_long filter_args_long,
 	const int copy, zend_long filter_flags
 ) /* {{{ */ {
 	zval *options = NULL;
 	zval *option;
 	char *charset = NULL;
 
-	if (!filter_args_is_null && !filter_args_ht) {
+	if (filter_args_long) {
 		zend_long lval = filter_args_long;
 
 		if (filter != -1) { /* handler for array apply */
@@ -545,7 +545,7 @@ static void php_filter_call(
 		} else {
 			filter = lval;
 		}
-	} else if (!filter_args_is_null) {
+	} else if (filter_args_ht) {
 		if ((option = zend_hash_str_find(filter_args_ht, "filter", sizeof("filter") - 1)) != NULL) {
 			filter = zval_get_long(option);
 		}
@@ -603,18 +603,18 @@ static void php_filter_call(
 }
 /* }}} */
 
-static void php_filter_array_handler(zval *input, HashTable *op_ht, zend_long op_long, zend_bool op_is_null,
+static void php_filter_array_handler(zval *input, HashTable *op_ht, zend_long op_long,
 	zval *return_value, zend_bool add_empty
 ) /* {{{ */ {
 	zend_string *arg_key;
 	zval *tmp, *arg_elm;
 
-	if (op_is_null) {
+	if (!op_long && !op_ht) {
 		ZVAL_DUP(return_value, input);
-		php_filter_call(return_value, FILTER_DEFAULT, NULL, 0, 1, 0, FILTER_REQUIRE_ARRAY);
-	} else if (!op_ht) {
+		php_filter_call(return_value, FILTER_DEFAULT, NULL, 0, 0, FILTER_REQUIRE_ARRAY);
+	} else if (op_long) {
 		ZVAL_DUP(return_value, input);
-		php_filter_call(return_value, op_long, NULL, 0, 1, 0, FILTER_REQUIRE_ARRAY);
+		php_filter_call(return_value, op_long, NULL, 0, 0, FILTER_REQUIRE_ARRAY);
 	} else {
 		array_init(return_value);
 
@@ -638,7 +638,7 @@ static void php_filter_array_handler(zval *input, HashTable *op_ht, zend_long op
 				php_filter_call(&nval, -1,
 					Z_TYPE_P(arg_elm) == IS_ARRAY ? Z_ARRVAL_P(arg_elm) : NULL,
 					Z_TYPE_P(arg_elm) == IS_ARRAY ? 0 : zval_get_long(arg_elm),
-					Z_TYPE_P(arg_elm) == IS_NULL, 0, FILTER_REQUIRE_SCALAR
+					0, FILTER_REQUIRE_SCALAR
 				);
 				zend_hash_update(Z_ARRVAL_P(return_value), arg_key, &nval);
 			}
@@ -654,15 +654,14 @@ PHP_FUNCTION(filter_input)
 	zval *input = NULL, *tmp;
 	zend_string *var;
 	HashTable *filter_args_ht = NULL;
-	zend_long filter_args_long;
-	zend_bool filter_args_is_null = 1;
+	zend_long filter_args_long = 0;
 
 	ZEND_PARSE_PARAMETERS_START(2, 4)
 		Z_PARAM_LONG(fetch_from)
 		Z_PARAM_STR(var)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_LONG(filter)
-		Z_PARAM_ARRAY_HT_OR_LONG_OR_NULL(filter_args_ht, filter_args_long, filter_args_is_null)
+		Z_PARAM_ARRAY_HT_OR_LONG(filter_args_ht, filter_args_long)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (!PHP_FILTER_ID_EXISTS(filter)) {
@@ -677,21 +676,19 @@ PHP_FUNCTION(filter_input)
 	if (!input || (tmp = zend_hash_find(Z_ARRVAL_P(input), var)) == NULL) {
 		zend_long filter_flags = 0;
 		zval *option, *opt, *def;
-		if (!filter_args_is_null) {
-			if (!filter_args_ht) {
-				filter_flags = filter_args_long;
-			} else {
-				if ((option = zend_hash_str_find(filter_args_ht, "flags", sizeof("flags") - 1)) != NULL) {
-					filter_flags = zval_get_long(option);
-				}
+		if (filter_args_long) {
+			filter_flags = filter_args_long;
+		} else if (filter_args_ht) {
+			if ((option = zend_hash_str_find(filter_args_ht, "flags", sizeof("flags") - 1)) != NULL) {
+				filter_flags = zval_get_long(option);
+			}
 
-				if ((opt = zend_hash_str_find_deref(filter_args_ht, "options", sizeof("options") - 1)) != NULL &&
-					Z_TYPE_P(opt) == IS_ARRAY &&
-					(def = zend_hash_str_find_deref(Z_ARRVAL_P(opt), "default", sizeof("default") - 1)) != NULL
-				) {
-					ZVAL_COPY(return_value, def);
-					return;
-				}
+			if ((opt = zend_hash_str_find_deref(filter_args_ht, "options", sizeof("options") - 1)) != NULL &&
+				Z_TYPE_P(opt) == IS_ARRAY &&
+				(def = zend_hash_str_find_deref(Z_ARRVAL_P(opt), "default", sizeof("default") - 1)) != NULL
+			) {
+				ZVAL_COPY(return_value, def);
+				return;
 			}
 		}
 
@@ -709,7 +706,7 @@ PHP_FUNCTION(filter_input)
 
 	ZVAL_DUP(return_value, tmp);
 
-	php_filter_call(return_value, filter, filter_args_ht, filter_args_long, filter_args_is_null, 1, FILTER_REQUIRE_SCALAR);
+	php_filter_call(return_value, filter, filter_args_ht, filter_args_long, 1, FILTER_REQUIRE_SCALAR);
 }
 /* }}} */
 
@@ -719,14 +716,13 @@ PHP_FUNCTION(filter_var)
 	zend_long filter = FILTER_DEFAULT;
 	zval *data;
 	HashTable *filter_args_ht = NULL;
-	zend_long filter_args_long;
-	zend_bool filter_args_is_null = 1;
+	zend_long filter_args_long = 0;
 
 	ZEND_PARSE_PARAMETERS_START(1, 3)
 		Z_PARAM_ZVAL(data)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_LONG(filter)
-		Z_PARAM_ARRAY_HT_OR_LONG_OR_NULL(filter_args_ht, filter_args_long, filter_args_is_null)
+		Z_PARAM_ARRAY_HT_OR_LONG(filter_args_ht, filter_args_long)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (!PHP_FILTER_ID_EXISTS(filter)) {
@@ -735,7 +731,7 @@ PHP_FUNCTION(filter_var)
 
 	ZVAL_DUP(return_value, data);
 
-	php_filter_call(return_value, filter, filter_args_ht, filter_args_long, filter_args_is_null, 1, FILTER_REQUIRE_SCALAR);
+	php_filter_call(return_value, filter, filter_args_ht, filter_args_long, 1, FILTER_REQUIRE_SCALAR);
 }
 /* }}} */
 
@@ -746,17 +742,16 @@ PHP_FUNCTION(filter_input_array)
 	zval   *array_input = NULL;
 	zend_bool add_empty = 1;
 	HashTable *op_ht = NULL;
-	zend_long op_long;
-	zend_bool op_is_null = 1;
+	zend_long op_long = 0;
 
 	ZEND_PARSE_PARAMETERS_START(1, 3)
 		Z_PARAM_LONG(fetch_from)
 		Z_PARAM_OPTIONAL
-		Z_PARAM_ARRAY_HT_OR_LONG_OR_NULL(op_ht, op_long, op_is_null)
+		Z_PARAM_ARRAY_HT_OR_LONG(op_ht, op_long)
 		Z_PARAM_BOOL(add_empty)
 	ZEND_PARSE_PARAMETERS_END();
 
-	if (!op_is_null && !op_ht && !PHP_FILTER_ID_EXISTS(op_long)) {
+	if (op_long && !PHP_FILTER_ID_EXISTS(op_long)) {
 		RETURN_FALSE;
 	}
 
@@ -768,12 +763,10 @@ PHP_FUNCTION(filter_input_array)
 	if (!array_input) {
 		zend_long filter_flags = 0;
 		zval *option;
-		if (!op_is_null) {
-			if (!op_ht) {
-				filter_flags = op_long;
-			} else if ((option = zend_hash_str_find(op_ht, "flags", sizeof("flags") - 1)) != NULL) {
-				filter_flags = zval_get_long(option);
-			}
+		if (op_long) {
+			filter_flags = op_long;
+		} else if (op_ht && (option = zend_hash_str_find(op_ht, "flags", sizeof("flags") - 1)) != NULL) {
+			filter_flags = zval_get_long(option);
 		}
 
 		/* The FILTER_NULL_ON_FAILURE flag inverts the usual return values of
@@ -788,7 +781,7 @@ PHP_FUNCTION(filter_input_array)
 		}
 	}
 
-	php_filter_array_handler(array_input, op_ht, op_long, op_is_null, return_value, add_empty);
+	php_filter_array_handler(array_input, op_ht, op_long, return_value, add_empty);
 }
 /* }}} */
 
@@ -798,21 +791,20 @@ PHP_FUNCTION(filter_var_array)
 	zval *array_input = NULL;
 	zend_bool add_empty = 1;
 	HashTable *op_ht = NULL;
-	zend_long op_long;
-	zend_bool op_is_null = 1;
+	zend_long op_long = 0;
 
 	ZEND_PARSE_PARAMETERS_START(1, 3)
 		Z_PARAM_ARRAY(array_input)
 		Z_PARAM_OPTIONAL
-		Z_PARAM_ARRAY_HT_OR_LONG_OR_NULL(op_ht, op_long, op_is_null)
+		Z_PARAM_ARRAY_HT_OR_LONG(op_ht, op_long)
 		Z_PARAM_BOOL(add_empty)
 	ZEND_PARSE_PARAMETERS_END();
 
-	if (!op_is_null && !op_ht && !PHP_FILTER_ID_EXISTS(op_long)) {
+	if (op_long && !PHP_FILTER_ID_EXISTS(op_long)) {
 		RETURN_FALSE;
 	}
 
-	php_filter_array_handler(array_input, op_ht, op_long, op_is_null, return_value, add_empty);
+	php_filter_array_handler(array_input, op_ht, op_long, return_value, add_empty);
 }
 /* }}} */
 
diff --git a/ext/filter/filter.stub.php b/ext/filter/filter.stub.php
@@ -4,13 +4,13 @@
 
 function filter_has_var(int $type, string $variable_name): bool {}
 
-function filter_input(int $type, string $variable_name, int $filter = FILTER_DEFAULT, array|int|null $options = null): mixed {}
+function filter_input(int $type, string $variable_name, int $filter = FILTER_DEFAULT, array|int $options = []): mixed {}
 
-function filter_var(mixed $variable, int $filter = FILTER_DEFAULT, array|int|null $options = null): mixed {}
+function filter_var(mixed $variable, int $filter = FILTER_DEFAULT, array|int $options = []): mixed {}
 
-function filter_input_array(int $type, array|int|null $options = null, bool $add_empty = true): array|false|null {}
+function filter_input_array(int $type, array|int $options = [], bool $add_empty = true): array|false|null {}
 
-function filter_var_array(array $data, array|int|null $options = null, bool $add_empty = true): array|false|null {}
+function filter_var_array(array $data, array|int $options = [], bool $add_empty = true): array|false|null {}
 
 function filter_list(): array {}
 
diff --git a/ext/filter/filter_arginfo.h b/ext/filter/filter_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 6e5d5380e10a17df23769d1e8f04778143252827 */
+ * Stub hash: dfd87cd01b448776214514a5fb5e25bb0de9d1b5 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_filter_has_var, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, type, IS_LONG, 0)
@@ -10,24 +10,24 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_filter_input, 0, 2, IS_MIXED, 0)
 	ZEND_ARG_TYPE_INFO(0, type, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, variable_name, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, filter, IS_LONG, 0, "FILTER_DEFAULT")
-	ZEND_ARG_TYPE_MASK(0, options, MAY_BE_ARRAY|MAY_BE_LONG|MAY_BE_NULL, "null")
+	ZEND_ARG_TYPE_MASK(0, options, MAY_BE_ARRAY|MAY_BE_LONG, "[]")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_filter_var, 0, 1, IS_MIXED, 0)
 	ZEND_ARG_TYPE_INFO(0, variable, IS_MIXED, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, filter, IS_LONG, 0, "FILTER_DEFAULT")
-	ZEND_ARG_TYPE_MASK(0, options, MAY_BE_ARRAY|MAY_BE_LONG|MAY_BE_NULL, "null")
+	ZEND_ARG_TYPE_MASK(0, options, MAY_BE_ARRAY|MAY_BE_LONG, "[]")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_filter_input_array, 0, 1, MAY_BE_ARRAY|MAY_BE_FALSE|MAY_BE_NULL)
 	ZEND_ARG_TYPE_INFO(0, type, IS_LONG, 0)
-	ZEND_ARG_TYPE_MASK(0, options, MAY_BE_ARRAY|MAY_BE_LONG|MAY_BE_NULL, "null")
+	ZEND_ARG_TYPE_MASK(0, options, MAY_BE_ARRAY|MAY_BE_LONG, "[]")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, add_empty, _IS_BOOL, 0, "true")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_filter_var_array, 0, 1, MAY_BE_ARRAY|MAY_BE_FALSE|MAY_BE_NULL)
 	ZEND_ARG_TYPE_INFO(0, data, IS_ARRAY, 0)
-	ZEND_ARG_TYPE_MASK(0, options, MAY_BE_ARRAY|MAY_BE_LONG|MAY_BE_NULL, "null")
+	ZEND_ARG_TYPE_MASK(0, options, MAY_BE_ARRAY|MAY_BE_LONG, "[]")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, add_empty, _IS_BOOL, 0, "true")
 ZEND_END_ARG_INFO()
 
diff --git a/ext/filter/tests/011.phpt b/ext/filter/tests/011.phpt
@@ -30,7 +30,7 @@ echo "Done\n";
 string(4) "test"
 string(18) "http://example.com"
 string(27) "&#60;b&#62;test&#60;/b&#62;"
-filter_input(): Argument #4 ($options) must be of type array|int|null, stdClass given
+filter_input(): Argument #4 ($options) must be of type array|int, stdClass given
 string(6) "string"
 float(12345.7)
 string(29) "&#60;p&#62;string&#60;/p&#62;"
diff --git a/ext/filter/tests/039.phpt b/ext/filter/tests/039.phpt
@@ -92,17 +92,17 @@ array(2) {
 }
 bool(false)
 bool(false)
-filter_var_array(): Argument #2 ($options) must be of type array|int|null, string given
+filter_var_array(): Argument #2 ($options) must be of type array|int, string given
 -- (2)
 bool(false)
 bool(false)
-filter_var_array(): Argument #2 ($options) must be of type array|int|null, string given
+filter_var_array(): Argument #2 ($options) must be of type array|int, string given
 -- (3)
 bool(false)
 bool(false)
-filter_var_array(): Argument #2 ($options) must be of type array|int|null, string given
+filter_var_array(): Argument #2 ($options) must be of type array|int, string given
 -- (4)
-filter_var_array(): Argument #2 ($options) must be of type array|int|null, stdClass given
+filter_var_array(): Argument #2 ($options) must be of type array|int, stdClass given
 array(0) {
 }
 array(1) {
@@ -132,7 +132,7 @@ array(1) {
   string(0) ""
 }
 int(100000)
-filter_var_array(): Argument #2 ($options) must be of type array|int|null, string given
+filter_var_array(): Argument #2 ($options) must be of type array|int, string given
 array(1) {
   [""]=>
   string(0) ""
diff --git a/ext/filter/tests/057.phpt b/ext/filter/tests/057.phpt
@@ -24,11 +24,12 @@ array(0) {
 }
 bool(false)
 bool(false)
+NULL
+array(0) {
+}
 bool(false)
 bool(false)
-bool(false)
-bool(false)
-filter_input_array(): Argument #2 ($options) must be of type array|int|null, string given
-filter_var_array(): Argument #2 ($options) must be of type array|int|null, string given
-filter_input_array(): Argument #2 ($options) must be of type array|int|null, stdClass given
-filter_var_array(): Argument #2 ($options) must be of type array|int|null, stdClass given
+filter_input_array(): Argument #2 ($options) must be of type array|int, string given
+filter_var_array(): Argument #2 ($options) must be of type array|int, string given
+filter_input_array(): Argument #2 ($options) must be of type array|int, stdClass given
+filter_var_array(): Argument #2 ($options) must be of type array|int, stdClass given
