Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix libtidy exports when ext/tidy compiled static

ext/tidy/config.w32

@@ -3,7 +3,9 @@
 ARG_WITH("tidy", "TIDY support", "no");
 
 if (PHP_TIDY != "no") {
-	if (CHECK_LIB("libtidy_a.lib;libtidy.lib;tidy_a.lib;tidy.lib", "tidy", PHP_TIDY) &&
+	var tidy_static = false;
+	if (CHECK_LIB("libtidy_a.lib;tidy_a.lib", "tidy", PHP_TIDY) && (tidy_static = true) ||
+		CHECK_LIB("libtidy.lib;tidy.lib", "tidy", PHP_TIDY)) &&
 			(
 				CHECK_HEADER_ADD_INCLUDE("tidy.h", "CFLAGS_TIDY") ||
 				CHECK_HEADER_ADD_INCLUDE("tidy/tidy.h", "CFLAGS_TIDY", null, null, true) ||
@@ -23,6 +25,10 @@ if (PHP_TIDY != "no") {
 		if (!PHP_TIDY_SHARED) {
 			ADD_DEF_FILE("ext\\tidy\\php_tidy.def");
 		}
+		if (tidy_static) {
+			ADD_FLAG("CFLAGS_TIDY", "/DTIDY_STATIC=1");
+		}
+
 	} else {
 		WARNING("tidy not enabled; libraries and headers not found");
 	}

ext/tidy/php_tidy.def

@@ -1,290 +1,190 @@
 EXPORTS
-tidyBufInit
+TidyLangPosixName
+TidyLangWindowsName
+getErrorCodeList
+getInstalledLanguageList
+getNextErrorCode
+getNextInstalledLanguage
+getNextStringKey
+getNextWindowsLanguage
+getStringKeyList
+getWindowsLanguageList
+tidyAccessWarningCount
+tidyAttrDiscard
+tidyAttrFirst
+tidyAttrGetById
+tidyAttrGetId
+tidyAttrIsEvent
+tidyAttrName
+tidyAttrNext
+tidyAttrValue
 tidyBufAlloc
-tidyBufCheckAlloc
-tidyBufFree
-tidyBufClear
-tidyBufAttach
-tidyBufDetach
+tidyBufAllocWithAllocator
 tidyBufAppend
-tidyBufPutByte
-tidyBufPopByte
-tidyBufGetByte
+tidyBufAttach
+tidyBufCheckAlloc
+tidyBufClear
+tidyBufDetach
 tidyBufEndOfInput
+tidyBufFree
+tidyBufGetByte
+tidyBufInit
+tidyBufInitWithAllocator
+tidyBufPopByte
+tidyBufPutByte
 tidyBufUngetByte
+tidyCleanAndRepair
+tidyConfigErrorCount
 tidyCreate
-tidyRelease
-tidySetAppData
-tidyGetAppData
-tidyReleaseDate
-tidyStatus
+tidyCreateWithAllocator
+tidyDefaultString
+tidyDetectedGenericXml
 tidyDetectedHtmlVersion
 tidyDetectedXhtml
-tidyDetectedGenericXml
+tidyDiscardElement
+tidyErrorCodeAsKey
+tidyErrorCodeFromKey
 tidyErrorCount
-tidyWarningCount
-tidyAccessWarningCount
-tidyConfigErrorCount
-tidyLoadConfig
-tidyLoadConfigEnc
+tidyErrorSummary
 tidyFileExists
-tidySetCharEncoding
-tidySetOptionCallback
-tidyOptGetIdForName
-tidyGetOptionList
+tidyGeneralInfo
+tidyGetAppData
+tidyGetArgFormat
+tidyGetArgType
+tidyGetArgValueDouble
+tidyGetArgValueInt
+tidyGetArgValueString
+tidyGetArgValueUInt
+tidyGetBody
+tidyGetByte
+tidyGetChild
+tidyGetEmacsFile
+tidyGetHead
+tidyGetHtml
+tidyGetLanguage
+tidyGetMessage
+tidyGetMessageArguments
+tidyGetMessageCode
+tidyGetMessageColumn
+tidyGetMessageDefault
+tidyGetMessageDoc
+tidyGetMessageFormat
+tidyGetMessageFormatDefault
+tidyGetMessageIsMuted
+tidyGetMessageKey
+tidyGetMessageLevel
+tidyGetMessageLine
+tidyGetMessageOutput
+tidyGetMessageOutputDefault
+tidyGetMessagePos
+tidyGetMessagePosDefault
+tidyGetMessagePrefix
+tidyGetMessagePrefixDefault
+tidyGetNext
+tidyGetNextMessageArgument
 tidyGetNextOption
 tidyGetOption
 tidyGetOptionByName
-tidyOptGetId
-tidyOptGetName
-tidyOptGetType
-tidyOptIsReadOnly
-tidyOptGetCategory
-tidyOptGetDefault
-tidyOptGetDefaultInt
-tidyOptGetDefaultBool
-tidyOptGetPickList
-tidyOptGetNextPick
-tidyOptGetValue
-tidyOptSetValue
-tidyOptParseValue
-tidyOptGetInt
-tidyOptSetInt
-tidyOptGetBool
-tidyOptSetBool
-tidyOptResetToDefault
-tidyOptResetAllToDefault
-tidyOptSnapshot
-tidyOptResetToSnapshot
+tidyGetOptionList
+tidyGetParent
+tidyGetPrev
+tidyGetRoot
+tidyInitInputBuffer
+tidyInitOutputBuffer
+tidyInitSink
+tidyInitSource
+tidyIsEOF
+tidyLibraryVersion
+tidyLoadConfig
+tidyLoadConfigEnc
+tidyLocalizedString
+tidyLocalizedStringN
+tidyNodeColumn
+tidyNodeGetId
+tidyNodeGetName
+tidyNodeGetText
+tidyNodeGetType
+tidyNodeGetValue
+tidyNodeHasText
+tidyNodeIsHeader
+tidyNodeIsProp
+tidyNodeIsText
+tidyNodeLine
+tidyOptCopyConfig
 tidyOptDiffThanDefault
 tidyOptDiffThanSnapshot
-tidyOptCopyConfig
-tidyOptGetEncName
+tidyOptGetBool
+tidyOptGetCategory
 tidyOptGetCurrPick
 tidyOptGetDeclTagList
+tidyOptGetDefault
+tidyOptGetDefaultBool
+tidyOptGetDefaultInt
+tidyOptGetDoc
+tidyOptGetDocLinksList
+tidyOptGetEncName
+tidyOptGetId
+tidyOptGetIdForName
+tidyOptGetInt
+tidyOptGetMutedMessageList
+tidyOptGetName
 tidyOptGetNextDeclTag
-tidyInitSource
-tidyGetByte
-tidyUngetByte
-tidyIsEOF
-tidyInitSink
-tidyPutByte
-tidySetReportFilter
-tidySetErrorFile
-tidySetErrorBuffer
-tidySetErrorSink
-tidySetMallocCall
-tidySetReallocCall
-tidySetFreeCall
-tidySetPanicCall
-tidyParseFile
-tidyParseStdin
-tidyParseString
-tidyParseBuffer
-tidyParseSource
-tidyCleanAndRepair
-tidyRunDiagnostics
-tidySaveFile
-tidySaveStdout
-tidySaveBuffer
-tidySaveString
-tidySaveSink
+tidyOptGetNextDocLinks
+tidyOptGetNextMutedMessage
+tidyOptGetNextPick
+tidyOptGetNextPriorityAttr
+tidyOptGetPickList
+tidyOptGetPriorityAttrList
+tidyOptGetType
+tidyOptGetValue
+tidyOptIsReadOnly
+tidyOptParseValue
+tidyOptResetAllToDefault
+tidyOptResetToDefault
+tidyOptResetToSnapshot
 tidyOptSaveFile
 tidyOptSaveSink
-tidyErrorSummary
-tidyGeneralInfo
-tidyGetRoot
-tidyGetHtml
-tidyGetHead
-tidyGetBody
-tidyGetParent
-tidyGetChild
-tidyGetNext
-tidyGetPrev
-tidyAttrFirst
-tidyAttrNext
-tidyAttrName
-tidyAttrValue
-tidyNodeGetType
-tidyNodeGetName
-tidyNodeIsText
-tidyNodeIsProp
-tidyNodeIsHeader
-tidyNodeHasText
-tidyNodeGetText
-tidyNodeGetId
-tidyNodeLine
-tidyNodeColumn
-tidyNodeIsHTML
-tidyNodeIsHEAD
-tidyNodeIsTITLE
-tidyNodeIsBASE
-tidyNodeIsMETA
-tidyNodeIsBODY
-tidyNodeIsFRAMESET
-tidyNodeIsFRAME
-tidyNodeIsIFRAME
-tidyNodeIsNOFRAMES
-tidyNodeIsHR
-tidyNodeIsH1
-tidyNodeIsH2
-tidyNodeIsPRE
-tidyNodeIsLISTING
-tidyNodeIsP
-tidyNodeIsUL
-tidyNodeIsOL
-tidyNodeIsDL
-tidyNodeIsDIR
-tidyNodeIsLI
-tidyNodeIsDT
-tidyNodeIsDD
-tidyNodeIsTABLE
-tidyNodeIsCAPTION
-tidyNodeIsTD
-tidyNodeIsTH
-tidyNodeIsTR
-tidyNodeIsCOL
-tidyNodeIsCOLGROUP
-tidyNodeIsBR
-tidyNodeIsA
-tidyNodeIsLINK
-tidyNodeIsB
-tidyNodeIsI
-tidyNodeIsSTRONG
-tidyNodeIsEM
-tidyNodeIsBIG
-tidyNodeIsSMALL
-tidyNodeIsPARAM
-tidyNodeIsOPTION
-tidyNodeIsOPTGROUP
-tidyNodeIsIMG
-tidyNodeIsMAP
-tidyNodeIsAREA
-tidyNodeIsNOBR
-tidyNodeIsWBR
-tidyNodeIsFONT
-tidyNodeIsLAYER
-tidyNodeIsSPACER
-tidyNodeIsCENTER
-tidyNodeIsSTYLE
-tidyNodeIsSCRIPT
-tidyNodeIsNOSCRIPT
-tidyNodeIsFORM
-tidyNodeIsTEXTAREA
-tidyNodeIsBLOCKQUOTE
-tidyNodeIsAPPLET
-tidyNodeIsOBJECT
-tidyNodeIsDIV
-tidyNodeIsSPAN
-tidyNodeIsINPUT
-tidyNodeIsQ
-tidyNodeIsLABEL
-tidyNodeIsH3
-tidyNodeIsH4
-tidyNodeIsH5
-tidyNodeIsH6
-tidyNodeIsADDRESS
-tidyNodeIsXMP
-tidyNodeIsSELECT
-tidyNodeIsBLINK
-tidyNodeIsMARQUEE
-tidyNodeIsEMBED
-tidyNodeIsBASEFONT
-tidyNodeIsISINDEX
-tidyNodeIsS
-tidyNodeIsSTRIKE
-tidyNodeIsU
-tidyNodeIsMENU
-tidyAttrGetId
-tidyAttrIsEvent
-tidyAttrIsProp
-tidyAttrIsHREF
-tidyAttrIsSRC
-tidyAttrIsID
-tidyAttrIsNAME
-tidyAttrIsSUMMARY
-tidyAttrIsALT
-tidyAttrIsLONGDESC
-tidyAttrIsUSEMAP
-tidyAttrIsISMAP
-tidyAttrIsLANGUAGE
-tidyAttrIsTYPE
-tidyAttrIsVALUE
-tidyAttrIsCONTENT
-tidyAttrIsTITLE
-tidyAttrIsXMLNS
-tidyAttrIsDATAFLD
-tidyAttrIsWIDTH
-tidyAttrIsHEIGHT
-tidyAttrIsFOR
-tidyAttrIsSELECTED
-tidyAttrIsCHECKED
-tidyAttrIsLANG
-tidyAttrIsTARGET
-tidyAttrIsHTTP_EQUIV
-tidyAttrIsREL
-tidyAttrIsOnMOUSEMOVE
-tidyAttrIsOnMOUSEDOWN
-tidyAttrIsOnMOUSEUP
-tidyAttrIsOnCLICK
-tidyAttrIsOnMOUSEOVER
-tidyAttrIsOnMOUSEOUT
-tidyAttrIsOnKEYDOWN
-tidyAttrIsOnKEYUP
-tidyAttrIsOnKEYPRESS
-tidyAttrIsOnFOCUS
-tidyAttrIsOnBLUR
-tidyAttrIsBGCOLOR
-tidyAttrIsLINK
-tidyAttrIsALINK
-tidyAttrIsVLINK
-tidyAttrIsTEXT
-tidyAttrIsSTYLE
-tidyAttrIsABBR
-tidyAttrIsCOLSPAN
-tidyAttrIsROWSPAN
-tidyAttrGetHREF
-tidyAttrGetSRC
-tidyAttrGetID
-tidyAttrGetNAME
-tidyAttrGetSUMMARY
-tidyAttrGetALT
-tidyAttrGetLONGDESC
-tidyAttrGetUSEMAP
-tidyAttrGetISMAP
-tidyAttrGetLANGUAGE
-tidyAttrGetTYPE
-tidyAttrGetVALUE
-tidyAttrGetCONTENT
-tidyAttrGetTITLE
-tidyAttrGetXMLNS
-tidyAttrGetDATAFLD
-tidyAttrGetWIDTH
-tidyAttrGetHEIGHT
-tidyAttrGetFOR
-tidyAttrGetSELECTED
-tidyAttrGetCHECKED
-tidyAttrGetLANG
-tidyAttrGetTARGET
-tidyAttrGetHTTP_EQUIV
-tidyAttrGetREL
-tidyAttrGetOnMOUSEMOVE
-tidyAttrGetOnMOUSEDOWN
-tidyAttrGetOnMOUSEUP
-tidyAttrGetOnCLICK
-tidyAttrGetOnMOUSEOVER
-tidyAttrGetOnMOUSEOUT
-tidyAttrGetOnKEYDOWN
-tidyAttrGetOnKEYUP
-tidyAttrGetOnKEYPRESS
-tidyAttrGetOnFOCUS
-tidyAttrGetOnBLUR
-tidyAttrGetBGCOLOR
-tidyAttrGetLINK
-tidyAttrGetALINK
-tidyAttrGetVLINK
-tidyAttrGetTEXT
-tidyAttrGetSTYLE
-tidyAttrGetABBR
-tidyAttrGetCOLSPAN
-tidyAttrGetROWSPAN
+tidyOptSetBool
+tidyOptSetInt
+tidyOptSetValue
+tidyOptSnapshot
+tidyOptionIsList
+tidyParseBuffer
+tidyParseFile
+tidyParseSource
+tidyParseStdin
+tidyParseString
+tidyPlatform
+tidyPutByte
+tidyRelease
+tidyReleaseDate
+tidyReportDoctype
+tidyRunDiagnostics
+tidySaveBuffer
+tidySaveFile
+tidySaveSink
+tidySaveStdout
+tidySaveString
+tidySetAppData
+tidySetCharEncoding
+tidySetConfigCallback
+tidySetConfigChangeCallback
+tidySetEmacsFile
+tidySetErrorBuffer
+tidySetErrorFile
+tidySetErrorSink
+tidySetFreeCall
+tidySetInCharEncoding
+tidySetLanguage
+tidySetMallocCall
+tidySetMessageCallback
+tidySetOptionCallback
+tidySetOutCharEncoding
+tidySetPanicCall
+tidySetPrettyPrinterCallback
+tidySetReallocCall
+tidySetReportCallback
+tidySetReportFilter
+tidyStatus
+tidyUngetByte
+tidyWarningCount