From 8be3426a7fd968f4a18933745806d679252b88b3 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Sun, 26 May 2024 19:27:55 +0200 Subject: [PATCH] Add missing ext/libxml dependency to ext/xmlwriter (#14327) This adds the libxml extension to required dependencies for xmlwriter during the configuration phase (PHP_ADD_EXTENSION_DEP) and the runtime (ZEND_MOD_REQUIRED). The libxml is technically not a required extension in this case but it necessary to make it work properly (i.e. have proper error reporting, etc.). Added due to prior libxml requirement in documentation and build system. --- ext/xmlwriter/config.m4 | 6 +----- ext/xmlwriter/php_xmlwriter.c | 8 +++++++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ext/xmlwriter/config.m4 b/ext/xmlwriter/config.m4 index a3bce3c6526..a969548a42b 100644 --- a/ext/xmlwriter/config.m4 +++ b/ext/xmlwriter/config.m4 @@ -5,14 +5,10 @@ PHP_ARG_ENABLE([xmlwriter], [yes]) if test "$PHP_XMLWRITER" != "no"; then - - if test "$PHP_LIBXML" = "no"; then - AC_MSG_ERROR([XMLWriter extension requires LIBXML extension, add --with-libxml]) - fi - PHP_SETUP_LIBXML(XMLWRITER_SHARED_LIBADD, [ AC_DEFINE(HAVE_XMLWRITER,1,[ ]) PHP_NEW_EXTENSION(xmlwriter, php_xmlwriter.c, $ext_shared) + PHP_ADD_EXTENSION_DEP(xmlwriter, libxml) PHP_SUBST(XMLWRITER_SHARED_LIBADD) ]) fi diff --git a/ext/xmlwriter/php_xmlwriter.c b/ext/xmlwriter/php_xmlwriter.c index abb13578088..f0851e47563 100644 --- a/ext/xmlwriter/php_xmlwriter.c +++ b/ext/xmlwriter/php_xmlwriter.c @@ -175,9 +175,15 @@ static char *_xmlwriter_get_valid_file_path(char *source, char *resolved_path, i } /* }}} */ +static const zend_module_dep xmlwriter_deps[] = { + ZEND_MOD_REQUIRED("libxml") + ZEND_MOD_END +}; + /* {{{ xmlwriter_module_entry */ zend_module_entry xmlwriter_module_entry = { - STANDARD_MODULE_HEADER, + STANDARD_MODULE_HEADER_EX, NULL, + xmlwriter_deps, "xmlwriter", ext_functions, PHP_MINIT(xmlwriter),