From 0904dd3dc2bae8508f58f99c71e0d1d79fb91d38 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 8 Jul 2019 10:49:34 +0200 Subject: [PATCH] Remove INPUT_SESSION and INPUT_REQUEST These were never supported and always generated a warning. Remove them entirely for PHP 8. --- UPGRADING | 3 +++ ext/filter/filter.c | 11 ++--------- ext/filter/tests/040.phpt | 4 +++- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/UPGRADING b/UPGRADING index 7d00c468ad..4d0b05839c 100644 --- a/UPGRADING +++ b/UPGRADING @@ -91,6 +91,9 @@ PHP 8.0 UPGRADE NOTES . The FILTER_FLAG_SCHEME_REQUIRED and FILTER_FLAG_HOST_REQUIRED flags for the FILTER_VALIDATE_URL filter have been removed. The scheme and host are (and have been) always required. + . The INPUT_REQUEST and INPUT_SESSION source for filter_input() etc have been + removed. These were never implemented and their use always generated a + warning. - GD: . The deprecated function image2wbmp() has been removed. diff --git a/ext/filter/filter.c b/ext/filter/filter.c index 465992b419..f8720b3a7e 100644 --- a/ext/filter/filter.c +++ b/ext/filter/filter.c @@ -222,8 +222,6 @@ PHP_MINIT_FUNCTION(filter) REGISTER_LONG_CONSTANT("INPUT_COOKIE", PARSE_COOKIE, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("INPUT_ENV", PARSE_ENV, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("INPUT_SERVER", PARSE_SERVER, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INPUT_SESSION", PARSE_SESSION, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INPUT_REQUEST", PARSE_REQUEST, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("FILTER_FLAG_NONE", FILTER_FLAG_NONE, CONST_CS | CONST_PERSISTENT); @@ -549,13 +547,8 @@ static zval *php_filter_get_storage(zend_long arg)/* {{{ */ } array_ptr = !Z_ISUNDEF(IF_G(env_array)) ? &IF_G(env_array) : &PG(http_globals)[TRACK_VARS_ENV]; break; - case PARSE_SESSION: - /* FIXME: Implement session source */ - php_error_docref(NULL, E_WARNING, "INPUT_SESSION is not yet implemented"); - break; - case PARSE_REQUEST: - /* FIXME: Implement request source */ - php_error_docref(NULL, E_WARNING, "INPUT_REQUEST is not yet implemented"); + default: + php_error_docref(NULL, E_WARNING, "Unknown source"); break; } diff --git a/ext/filter/tests/040.phpt b/ext/filter/tests/040.phpt index 2ef6839405..f6de3eb84c 100644 --- a/ext/filter/tests/040.phpt +++ b/ext/filter/tests/040.phpt @@ -21,7 +21,7 @@ var_dump(filter_has_var(0, "cc")); echo "Done\n"; ?> ---EXPECT-- +--EXPECTF-- bool(false) bool(true) bool(true) @@ -29,6 +29,8 @@ bool(true) bool(true) bool(false) bool(false) + +Warning: filter_has_var(): Unknown source in %s on line %d bool(false) bool(false) Done -- 2.40.0