Merge branch 'PHP-8.0' into PHP-8.1

cmb69 · cmb69 · commit afc5ab4531f7 · 2022-08-25T15:11:41.000+02:00
* PHP-8.0:
  xmlRelaxNGCleanupTypes() is deprecated as of libxml2 2.10.0
diff --git a/ext/libxml/libxml.c b/ext/libxml/libxml.c
@@ -774,7 +774,7 @@ PHP_LIBXML_API void php_libxml_initialize(void)
 PHP_LIBXML_API void php_libxml_shutdown(void)
 {
 	if (_php_libxml_initialized) {
-#ifdef LIBXML_SCHEMAS_ENABLED
+#if defined(LIBXML_SCHEMAS_ENABLED) && LIBXML_VERSION < 21000
 		xmlRelaxNGCleanupTypes();
 #endif
 		/* xmlCleanupParser(); */

Original file line number	Diff line number	Diff line change
`@@ -774,7 +774,7 @@ PHP_LIBXML_API void php_libxml_initialize(void)`
`774`	`774`	`PHP_LIBXML_API void php_libxml_shutdown(void)`
`775`	`775`	`{`
`776`	`776`	`if (_php_libxml_initialized) {`
`777`		`-#ifdef LIBXML_SCHEMAS_ENABLED`
	`777`	`+#if defined(LIBXML_SCHEMAS_ENABLED) && LIBXML_VERSION < 21000`
`778`	`778`	`xmlRelaxNGCleanupTypes();`
`779`	`779`	`#endif`
`780`	`780`	`/* xmlCleanupParser(); */`