From 6a7b96529bbf4cecd0c1c5aff9fb6a1cf8be46f3 Mon Sep 17 00:00:00 2001 From: Niels Dossche <7771979+nielsdos@users.noreply.github.com> Date: Sun, 24 Sep 2023 00:17:50 +0200 Subject: [PATCH] Remove unnecessary libxml2 version checks The minimum required version is 2.9.0. So these checks are useless. --- ext/libxml/libxml.stub.php | 6 ------ ext/libxml/libxml_arginfo.h | 8 +------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/ext/libxml/libxml.stub.php b/ext/libxml/libxml.stub.php index 97793f0cdee..b60a6272503 100644 --- a/ext/libxml/libxml.stub.php +++ b/ext/libxml/libxml.stub.php @@ -93,13 +93,11 @@ const LIBXML_NOXMLDECL = UNKNOWN; * @cvalue XML_PARSE_HUGE */ const LIBXML_PARSEHUGE = UNKNOWN; -#if LIBXML_VERSION >= 20900 /** * @var int * @cvalue XML_PARSE_BIG_LINES */ const LIBXML_BIGLINES = UNKNOWN; -#endif /** * @var int * @cvalue LIBXML_SAVE_NOEMPTYTAG @@ -114,21 +112,17 @@ const LIBXML_NOEMPTYTAG = UNKNOWN; const LIBXML_SCHEMA_CREATE = UNKNOWN; #endif -#if LIBXML_VERSION >= 20707 /** * @var int * @cvalue HTML_PARSE_NOIMPLIED */ const LIBXML_HTML_NOIMPLIED = UNKNOWN; -#endif -#if LIBXML_VERSION >= 20708 /** * @var int * @cvalue HTML_PARSE_NODEFDTD */ const LIBXML_HTML_NODEFDTD = UNKNOWN; -#endif /** * @var int diff --git a/ext/libxml/libxml_arginfo.h b/ext/libxml/libxml_arginfo.h index bd143cbed4d..f532a982509 100644 --- a/ext/libxml/libxml_arginfo.h +++ b/ext/libxml/libxml_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: 8fa6f4fa2f3eb8db944626b5b3d814f5e3ae04a3 */ + * Stub hash: 98cdd082ed214f84fd741097dd58979accc37bff */ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_libxml_set_streams_context, 0, 1, IS_VOID, 0) ZEND_ARG_INFO(0, context) @@ -77,19 +77,13 @@ static void register_libxml_symbols(int module_number) REGISTER_LONG_CONSTANT("LIBXML_COMPACT", XML_PARSE_COMPACT, CONST_PERSISTENT); REGISTER_LONG_CONSTANT("LIBXML_NOXMLDECL", XML_SAVE_NO_DECL, CONST_PERSISTENT); REGISTER_LONG_CONSTANT("LIBXML_PARSEHUGE", XML_PARSE_HUGE, CONST_PERSISTENT); -#if LIBXML_VERSION >= 20900 REGISTER_LONG_CONSTANT("LIBXML_BIGLINES", XML_PARSE_BIG_LINES, CONST_PERSISTENT); -#endif REGISTER_LONG_CONSTANT("LIBXML_NOEMPTYTAG", LIBXML_SAVE_NOEMPTYTAG, CONST_PERSISTENT); #if defined(LIBXML_SCHEMAS_ENABLED) REGISTER_LONG_CONSTANT("LIBXML_SCHEMA_CREATE", XML_SCHEMA_VAL_VC_I_CREATE, CONST_PERSISTENT); #endif -#if LIBXML_VERSION >= 20707 REGISTER_LONG_CONSTANT("LIBXML_HTML_NOIMPLIED", HTML_PARSE_NOIMPLIED, CONST_PERSISTENT); -#endif -#if LIBXML_VERSION >= 20708 REGISTER_LONG_CONSTANT("LIBXML_HTML_NODEFDTD", HTML_PARSE_NODEFDTD, CONST_PERSISTENT); -#endif REGISTER_LONG_CONSTANT("LIBXML_ERR_NONE", XML_ERR_NONE, CONST_PERSISTENT); REGISTER_LONG_CONSTANT("LIBXML_ERR_WARNING", XML_ERR_WARNING, CONST_PERSISTENT); REGISTER_LONG_CONSTANT("LIBXML_ERR_ERROR", XML_ERR_ERROR, CONST_PERSISTENT);