Merge branch 'pull-request/2355'

* pull-request/2355:
  Deprecate INTL_IDNA_VARIANT_2003

We also add a respective note to UPGRADING.

UPGRADING

@@ -128,6 +128,10 @@ PHP 8.0.
   . The gmp_random() function has been deprecated, use gmp_random_bits() or
     gmp_random_range() instead.
 
+- Intl:
+  . INTL_IDNA_VARIANT_2003 has been deprecated; use INTL_IDNA_VARIANT_UTS46
+    instead.
+
 - Mbstring:
   . The mbstring.func_overload ini directive has been deprecated.
 

ext/intl/idn/idn.c

@@ -291,6 +291,10 @@ static void php_intl_idn_handoff(INTERNAL_FUNCTION_PARAMETERS, int mode)
 	}
 	/* don't check options; it wasn't checked before */
 
+	if (variant == INTL_IDN_VARIANT_2003) {
+		php_error_docref(NULL, E_DEPRECATED, "INTL_IDNA_VARIANT_2003 is deprecated");
+	}
+
 	if (idna_info != NULL) {
 		if (variant == INTL_IDN_VARIANT_2003) {
 			php_error_docref0(NULL, E_NOTICE,

ext/intl/tests/idn.phpt

@@ -13,6 +13,9 @@ echo idn_to_ascii("t\xC3\xA4st.de")."\n";
 echo urlencode(idn_to_utf8('xn--tst-qla.de'))."\n";
 
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: idn_to_ascii(): INTL_IDNA_VARIANT_2003 is deprecated in %s on line %d
 xn--tst-qla.de
+
+Deprecated: idn_to_utf8(): INTL_IDNA_VARIANT_2003 is deprecated in %s on line %d
 t%C3%A4st.de

ext/intl/tests/idn_uts46_errors.phpt

@@ -62,6 +62,8 @@ Warning: idn_to_ascii(): idn_to_ascii: empty domain name in %s on line %d
 bool(false)
 fourth arg for 2003 variant (only notice raised):
 
+Deprecated: idn_to_ascii(): INTL_IDNA_VARIANT_2003 is deprecated in %s on line %d
+
 Notice: idn_to_ascii(): 4 arguments were provided, but INTL_IDNA_VARIANT_2003 only takes 3 - extra argument ignored in %s on line %d
 string(7) "foo.com"
 with error, but no details arg: