Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #77027: tidy::getOptDoc() not available on Windows

diff --cc NEWS
index 64140070e175672f3b6368fbf8e034882bb24842,7823584107f0eae02a82775587f46417a6949593..adccc4d2bd41eed38c7602a56d46866a357ebf73
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,32 -1,6 +1,35 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2018, PHP 7.2.12
 +?? ??? ????, PHP 7.3.0RC4
 +
 +- Date:
 +  . Updated timelib to 2018.01RC1 to address several bugs: (Derick)
 +    . Fixed bug #75577 (DateTime::createFromFormat does not accept 'v' format
 +      specifier). (Derick)
 +    . Fixed bug #75642 (Wrap around behaviour for microseconds is not working).
 +      (Derick)
 +    . Fixed bug #77007 (fractions in `diff()` are not correctly normalized).
 +      (Derick)
 +
 +- Mbstring:
 +  . Fixed bug #77025 (mb_strpos throws Unknown encoding or conversion error).
 +    (Nikita)
 +
++- Tidy:
++  . Fixed bug #77027 (tidy::getOptDoc() not available on Windows). (cmb)
++
 +- Tokenizer:
 +  . Fixed bug #76991 (Incorrect tokenization of multiple invalid flexible
 +    heredoc strings). (Nikita)
 +
 +- XML:
 +  . Fixed bug #30875 (xml_parse_into_struct() does not resolve entities). (cmb)
 +  . Add support for getting SKIP_TAGSTART and SKIP_WHITE options. (cmb)
 +
 +11 Oct 2018, PHP 7.3.0RC3
 +
 +- CURL:
 +  . Expose curl constants from curl 7.50 to 7.61. (Pierrick)
  
  - Core:
    . Fixed bug #76846 (Segfault in shutdown function after memory limit error).

diff --cc ext/tidy/config.w32
index 9b20441a1ab478f788ec584e322b38dff5317048,aa4eb465398cadb192a793302bc201157957d4e1..b1768ca1c0fa99659d91aa16ce1f9012c76cf942
--- 1/ext/tidy/config.w32
--- 2/ext/tidy/config.w32
+++ b/ext/tidy/config.w32
@@@ -16,8 -17,7 +16,9 @@@ if (PHP_TIDY != "no") 
  
                EXTENSION("tidy", "tidy.c");
                AC_DEFINE('HAVE_TIDY', 1, 'Have TIDY library');
 +              AC_DEFINE('HAVE_TIDY_H', 1, "tidy include header")
+               AC_DEFINE('HAVE_TIDYOPTGETDOC', 1, "tidy_get_opt_doc function")
 +              AC_DEFINE('HAVE_TIDYRELEASEDATE', 1, "tidy release date function")
                ADD_FLAG('CFLAGS_TIDY', '/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1');
                if (!PHP_TIDY_SHARED) {
                        ADD_DEF_FILE("ext\\tidy\\php_tidy.def");