3 files changed, 14 insertions, 7 deletions
diff --git a/ext/xmlwriter/php_xmlwriter.c b/ext/xmlwriter/php_xmlwriter.c
index 6934feb77e..8c3c92849d 100644
--- a/ext/xmlwriter/php_xmlwriter.c
+++ b/ext/xmlwriter/php_xmlwriter.c
@@ -1032,16 +1032,13 @@ PHP_FUNCTION(xmlwriter_flush)
 /* {{{ PHP_MINIT_FUNCTION */
 static PHP_MINIT_FUNCTION(xmlwriter)
 {
-	zend_class_entry ce;
-
 	memcpy(&xmlwriter_object_handlers, &std_object_handlers, sizeof(zend_object_handlers));
 	xmlwriter_object_handlers.offset = XtOffsetOf(ze_xmlwriter_object, std);
 	xmlwriter_object_handlers.dtor_obj = xmlwriter_object_dtor;
 	xmlwriter_object_handlers.free_obj = xmlwriter_object_free_storage;
 	xmlwriter_object_handlers.clone_obj = NULL;
-	INIT_CLASS_ENTRY(ce, "XMLWriter", class_XMLWriter_methods);
-	ce.create_object = xmlwriter_object_new;
-	xmlwriter_class_entry_ce = zend_register_internal_class(&ce);
+	xmlwriter_class_entry_ce = register_class_XMLWriter();
+	xmlwriter_class_entry_ce->create_object = xmlwriter_object_new;
 
 	return SUCCESS;
 }
diff --git a/ext/xmlwriter/php_xmlwriter.stub.php b/ext/xmlwriter/php_xmlwriter.stub.php
index 9334545ffa..ee90003399 100644
--- a/ext/xmlwriter/php_xmlwriter.stub.php
+++ b/ext/xmlwriter/php_xmlwriter.stub.php
@@ -1,6 +1,6 @@
 <?php
 
-/** @generate-function-entries */
+/** @generate-class-entries */
 
 function xmlwriter_open_uri(string $uri): XMLWriter|false {}
 
diff --git a/ext/xmlwriter/php_xmlwriter_arginfo.h b/ext/xmlwriter/php_xmlwriter_arginfo.h
index 9325ffbdb5..7547479b3b 100644
--- a/ext/xmlwriter/php_xmlwriter_arginfo.h
+++ b/ext/xmlwriter/php_xmlwriter_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: a0ece6bc77b0a9811cb09a604b175e2295efc7a0 */
+ * Stub hash: ce5cf4f922e47833033729b2a8941c36fa2b4d6d */
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_xmlwriter_open_uri, 0, 1, XMLWriter, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, uri, IS_STRING, 0)
@@ -464,3 +464,13 @@ static const zend_function_entry class_XMLWriter_methods[] = {
 	ZEND_ME_MAPPING(flush, xmlwriter_flush, arginfo_class_XMLWriter_flush, ZEND_ACC_PUBLIC)
 	ZEND_FE_END
 };
+
+static zend_class_entry *register_class_XMLWriter(void)
+{
+	zend_class_entry ce, *class_entry;
+
+	INIT_CLASS_ENTRY(ce, "XMLWriter", class_XMLWriter_methods);
+	class_entry = zend_register_internal_class_ex(&ce, NULL);
+
+	return class_entry;
+}