Merge branch 'pull-request/2355'

* pull-request/2355:
  Deprecate INTL_IDNA_VARIANT_2003

We also add a respective note to UPGRADING.

diff --cc UPGRADING
index e072d407eabeb1d90a7a730ef2795bd40a46dd9e,e7a428aee268d0911b0a539b66ce284f5c233cf0..da884dcc4fb691a378fbb43dc897e87b374ce339
--- 1/UPGRADING
--- 2/UPGRADING
+++ b/UPGRADING
@@@ -108,35 -102,9 +108,39 @@@ PHP 7.2 UPGRADE NOTE
  4. Deprecated Functionality
  ========================================
  
 +All the deprecated functionality listed in the following will be removed in
 +PHP 8.0.
 +
 +- Core:
 +  . The trace_errors ini directive has been deprecated.
 +  . The __autoload() mechanism has been deprecated, use spl_autoload_register()
 +    instead.
 +  . The (unset) cast has been deprecated. This does not affect the unset($var)
 +    language construct.
 +  . The create_function() function has been deprecated, use anonymous functions
 +    instead.
 +  . The each() function has been deprecated, use a foreach loop instead.
 +
  - GD:
 -  . png2wbmp() and jpeg2wbmp() have been deprecated, and will be removed as of
 -    PHP 8.0.0.
 +  . png2wbmp() and jpeg2wbmp() have been deprecated.
 +
 +- GMP:
 +  . 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.
 +
 +- Standard:
 +  . Calling parse_str() without the result argument has been deprecated.
 +  . Calling assert() with a string argument has been deprecated, use an ordinary
 +    expression instead.
 +
 +See also: https://wiki.php.net/rfc/deprecations_php_7_2
  
  ========================================
  5. Changed Functions