Merge branch 'PHP-8.3'

* PHP-8.3: Fix libxml2 2.12 build due to API breaks
php · Dec 1, 2023 · 58fc521 · 58fc521
2 parents 6edbbc1 + f61f8d4
commit 58fc521
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ext/libxml/libxml.c b/ext/libxml/libxml.c
@@ -1088,7 +1088,7 @@ PHP_FUNCTION(libxml_get_last_error)
 {
 	ZEND_PARSE_PARAMETERS_NONE();
 
-	const xmlError* error = xmlGetLastError();
+	const xmlError *error = xmlGetLastError();
 
 	if (error) {
 		object_init_ex(return_value, libxmlerror_class_entry);

diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c
@@ -341,7 +341,7 @@ static void load_wsdl_ex(zval *this_ptr, char *struri, sdlCtx *ctx, int include)
 	sdl_restore_uri_credentials(ctx);
 
 	if (!wsdl) {
-		xmlErrorPtr xmlErrorPtr = xmlGetLastError();
+		const xmlError *xmlErrorPtr = xmlGetLastError();
 
 		if (xmlErrorPtr) {
 			soap_error2(E_ERROR, "Parsing WSDL: Couldn't load from '%s' : %s", struri, xmlErrorPtr->message);