Remove FILTER_FLAG_(SCHEME|HOST)_REQUIRED

Deprecated in PHP 7.3 as part of
https://wiki.php.net/rfc/deprecations_php_7_3.

diff --git a/UPGRADING b/UPGRADING
index ea6d6bbce97319e2566546906736c6a1a50d5e5c..2087adb715df462e1bc1cba0d6b265eedb5a24e9 100644 (file)
--- a/UPGRADING
+++ b/UPGRADING
@@ -27,6 +27,11 @@ PHP 8.0 UPGRADE NOTES
   . Removed create_function(). Anonymous functions may be used instead.
   . Removed each(). foreach or ArrayIterator should be used instead.
 
+- Filter:
+  . 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.
+
 - GD:
   . The deprecated function image2wbmp() has been removed.
     RFC: https://wiki.php.net/rfc/image2wbmp

diff --git a/ext/filter/filter.c b/ext/filter/filter.c
index 2112ff09df45beb5548553c22d47a9c9d20298cf..af103a86b719e92e9695d1a5bb179a7482827c9f 100644 (file)
--- a/ext/filter/filter.c
+++ b/ext/filter/filter.c
@@ -276,8 +276,6 @@ PHP_MINIT_FUNCTION(filter)
        REGISTER_LONG_CONSTANT("FILTER_FLAG_ALLOW_THOUSAND", FILTER_FLAG_ALLOW_THOUSAND, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("FILTER_FLAG_ALLOW_SCIENTIFIC", FILTER_FLAG_ALLOW_SCIENTIFIC, CONST_CS | CONST_PERSISTENT);
 
-       REGISTER_LONG_CONSTANT("FILTER_FLAG_SCHEME_REQUIRED", FILTER_FLAG_SCHEME_REQUIRED, CONST_CS | CONST_PERSISTENT);
-       REGISTER_LONG_CONSTANT("FILTER_FLAG_HOST_REQUIRED", FILTER_FLAG_HOST_REQUIRED, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("FILTER_FLAG_PATH_REQUIRED", FILTER_FLAG_PATH_REQUIRED, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("FILTER_FLAG_QUERY_REQUIRED", FILTER_FLAG_QUERY_REQUIRED, CONST_CS | CONST_PERSISTENT);
 

diff --git a/ext/filter/logical_filters.c b/ext/filter/logical_filters.c
index c4096593dcc51d56eeaffe116ba5805c95b9371c..a860fe0f5dfac4779b3b58e15c57ca656565849f 100644 (file)
--- a/ext/filter/logical_filters.c
+++ b/ext/filter/logical_filters.c
@@ -537,11 +537,6 @@ void php_filter_validate_url(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
        php_url *url;
        size_t old_len = Z_STRLEN_P(value);
 
-       if (flags & (FILTER_FLAG_SCHEME_REQUIRED | FILTER_FLAG_HOST_REQUIRED)) {
-               php_error_docref(NULL, E_DEPRECATED,
-                       "explicit use of FILTER_FLAG_SCHEME_REQUIRED and FILTER_FLAG_HOST_REQUIRED is deprecated");
-       }
-
        php_filter_url(value, flags, option_array, charset);
 
        if (Z_TYPE_P(value) != IS_STRING || old_len != Z_STRLEN_P(value)) {

diff --git a/ext/filter/tests/deprecated.phpt b/ext/filter/tests/deprecated.phpt
deleted file mode 100644 (file)
index a777105..0000000
--- a/ext/filter/tests/deprecated.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-FILTER_FLAG_SCHEME_REQUIRED and FILTER_FLAG_HOST_REQUIRED are deprecated
---SKIPIF--
-<?php
-if (!extension_loaded('filter')) die('skip filter extension not available');
-?>
---FILE--
-<?php
-var_dump(filter_var('//example.com/', FILTER_VALIDATE_URL, FILTER_FLAG_SCHEME_REQUIRED));
-var_dump(filter_var('http://', FILTER_VALIDATE_URL, FILTER_FLAG_HOST_REQUIRED));
-?>
-===DONE===
---EXPECTF--
-Deprecated: filter_var(): explicit use of FILTER_FLAG_SCHEME_REQUIRED and FILTER_FLAG_HOST_REQUIRED is deprecated in %s
-bool(false)
-
-Deprecated: filter_var(): explicit use of FILTER_FLAG_SCHEME_REQUIRED and FILTER_FLAG_HOST_REQUIRED is deprecated in %s
-bool(false)
-===DONE===