diff --git a/UPGRADING b/UPGRADING index 92824112259..28454f24ed8 100644 --- a/UPGRADING +++ b/UPGRADING @@ -381,6 +381,10 @@ PHP 8.0 UPGRADE NOTES 10. New Global Constants ======================================== +- Filter: + . FILTER_VALIDATE_BOOL has been added as an alias for FILTER_VALIDATE_BOOLEAN. + The new name is preferred, as it uses the canonical type name. + ======================================== 11. Changes to INI File Handling ======================================== diff --git a/ext/filter/filter.c b/ext/filter/filter.c index 23ef0bdf9bc..d91f050a95f 100644 --- a/ext/filter/filter.c +++ b/ext/filter/filter.c @@ -37,7 +37,7 @@ typedef struct filter_list_entry { /* {{{ filter_list */ static const filter_list_entry filter_list[] = { { "int", FILTER_VALIDATE_INT, php_filter_int }, - { "boolean", FILTER_VALIDATE_BOOLEAN, php_filter_boolean }, + { "boolean", FILTER_VALIDATE_BOOL, php_filter_boolean }, { "float", FILTER_VALIDATE_FLOAT, php_filter_float }, { "validate_regexp", FILTER_VALIDATE_REGEXP, php_filter_validate_regexp }, @@ -190,7 +190,8 @@ PHP_MINIT_FUNCTION(filter) REGISTER_LONG_CONSTANT("FILTER_NULL_ON_FAILURE", FILTER_NULL_ON_FAILURE, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("FILTER_VALIDATE_INT", FILTER_VALIDATE_INT, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("FILTER_VALIDATE_BOOLEAN", FILTER_VALIDATE_BOOLEAN, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("FILTER_VALIDATE_BOOLEAN", FILTER_VALIDATE_BOOL, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("FILTER_VALIDATE_BOOL", FILTER_VALIDATE_BOOL, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("FILTER_VALIDATE_FLOAT", FILTER_VALIDATE_FLOAT, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("FILTER_VALIDATE_REGEXP", FILTER_VALIDATE_REGEXP, CONST_CS | CONST_PERSISTENT); diff --git a/ext/filter/filter_private.h b/ext/filter/filter_private.h index 5dcbd5c3cc3..f8a02a49077 100644 --- a/ext/filter/filter_private.h +++ b/ext/filter/filter_private.h @@ -56,7 +56,7 @@ #define FILTER_FLAG_EMAIL_UNICODE 0x100000 #define FILTER_VALIDATE_INT 0x0101 -#define FILTER_VALIDATE_BOOLEAN 0x0102 +#define FILTER_VALIDATE_BOOL 0x0102 #define FILTER_VALIDATE_FLOAT 0x0103 #define FILTER_VALIDATE_REGEXP 0x0110 diff --git a/ext/filter/tests/061.phpt b/ext/filter/tests/061.phpt new file mode 100644 index 00000000000..b8b3a5186ac --- /dev/null +++ b/ext/filter/tests/061.phpt @@ -0,0 +1,70 @@ +--TEST-- +filter_var() and FILTER_VALIDATE_BOOL +--SKIPIF-- + +--FILE-- + +--EXPECT-- +bool(false) +bool(false) +bool(false) +array(5) { + [0]=> + bool(true) + [1]=> + bool(false) + [2]=> + bool(false) + [3]=> + bool(false) + [4]=> + array(2) { + [0]=> + bool(false) + [1]=> + bool(false) + } +} +bool(true) +bool(true) +bool(false) +bool(false) +bool(true) +bool(false) +bool(true) +bool(false) +bool(false) +bool(false) +bool(false) +bool(false) +Done