Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Suppress deprecation warning on IDNA2003 ICU methods for clang

diff --cc ext/intl/idn/idn.c
index 5f9a8d11ccf1ef79c7e3ded6e1e0627fbb1f6e18,60d7b829d84e8f3d41d84300a5b180492cf58ba1..cb0d0ee8cde147d19e2d8dc492bfa9b93e6cff95
--- 1/ext/intl/idn/idn.c
--- 2/ext/intl/idn/idn.c
+++ b/ext/intl/idn/idn.c
@@@ -225,11 -221,12 +225,14 @@@ static void php_intl_idn_to(INTERNAL_FU
                RETURN_FALSE;
        } else {
                UParseError parse_error;
 +              UChar       converted[MAXPATHLEN];
 +              int32_t     converted_ret_len;
  
                status = U_ZERO_ERROR;
- #if (ZEND_GCC_VERSION >= 4002) && !defined(__clang__)
+ #if defined(__clang__)
+ # pragma clang diagnostic push
+ # pragma clang diagnostic ignored "-Wdeprecated-declarations"
+ #elif ZEND_GCC_VERSION >= 4002
  # pragma GCC diagnostic push
  # pragma GCC diagnostic ignored "-Wdeprecated-declarations"
  #endif