Remove return types from XMLWriter stubs

These break BC, and as such we have to stick with docblock annotations.

Closes GH-6319.

diff --git a/NEWS b/NEWS
index 1c087b6de10c9a43c85dc1d15a344af495279db8..03dbfc93d5fa7762e4bf5029544e21ca2d87285e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -27,6 +27,9 @@ PHP                                                                        NEWS
   . Fixed bug #64060 (lstat_stat_variation7.phpt fails on certain file systems).
     (M. Voelker, cmb)
 
+- XMLWriter:
+  . Removed return types from XMLWriter stubs. (cmb)
+
 01 Oct 2020, PHP 8.0.0rc1
 
 - CLI:

diff --git a/ext/xmlwriter/php_xmlwriter.stub.php b/ext/xmlwriter/php_xmlwriter.stub.php
index 857a41774c4fdee3687af945255174b5d9dd98a2..cab872ce108674a6a2acb4cc5e4ebe2919ad8e30 100644 (file)
--- a/ext/xmlwriter/php_xmlwriter.stub.php
+++ b/ext/xmlwriter/php_xmlwriter.stub.php
@@ -88,129 +88,255 @@ function xmlwriter_flush(XMLWriter $writer, bool $empty = true): string|int {}
 
 class XMLWriter
 {
-    /** @alias xmlwriter_open_uri */
-    public function openUri(string $uri): bool {}
-
-    /** @alias xmlwriter_open_memory */
-    public function openMemory(): bool {}
-
-    /** @alias xmlwriter_set_indent */
-    public function setIndent(bool $enable): bool {}
-
-    /** @alias xmlwriter_set_indent_string */
-    public function setIndentString(string $indentation): bool {}
-
-    /** @alias xmlwriter_start_comment */
-    public function startComment(): bool {}
-
-    /** @alias xmlwriter_end_comment */
-    public function endComment(): bool {}
-
-    /** @alias xmlwriter_start_attribute */
-    public function startAttribute(string $name): bool {}
-
-    /** @alias xmlwriter_end_attribute */
-    public function endAttribute(): bool {}
-
-    /** @alias xmlwriter_write_attribute */
-    public function writeAttribute(string $name, string $value): bool {}
-
-    /** @alias xmlwriter_start_attribute_ns */
-    public function startAttributeNs(?string $prefix, string $name, ?string $namespace): bool {}
-
-    /** @alias xmlwriter_write_attribute_ns */
-    public function writeAttributeNs(?string $prefix, string $name, ?string $namespace, string $value): bool {}
-
-    /** @alias xmlwriter_start_element */
-    public function startElement(string $name): bool {}
-
-    /** @alias xmlwriter_end_element */
-    public function endElement(): bool {}
-
-    /** @alias xmlwriter_full_end_element */
-    public function fullEndElement(): bool {}
-
-    /** @alias xmlwriter_start_element_ns */
-    public function startElementNs(?string $prefix, string $name, ?string $namespace): bool {}
-
-    /** @alias xmlwriter_write_element */
-    public function writeElement(string $name, ?string $content = null): bool {}
-
-    /** @alias xmlwriter_write_element_ns */
-    public function writeElementNs(?string $prefix, string $name, ?string $namespace, ?string $content = null): bool {}
-
-    /** @alias xmlwriter_start_pi */
-    public function startPi(string $target): bool {}
-
-    /** @alias xmlwriter_end_pi */
-    public function endPi(): bool {}
-
-    /** @alias xmlwriter_write_pi */
-    public function writePi(string $target, string $content): bool {}
-
-    /** @alias xmlwriter_start_cdata */
-    public function startCdata(): bool {}
-
-    /** @alias xmlwriter_end_cdata */
-    public function endCdata(): bool {}
-
-    /** @alias xmlwriter_write_cdata */
-    public function writeCdata(string $content): bool {}
-
-    /** @alias xmlwriter_text */
-    public function text(string $content): bool {}
-
-    /** @alias xmlwriter_write_raw */
-    public function writeRaw(string $content): bool {}
-
-    /** @alias xmlwriter_start_document */
-    public function startDocument(?string $version = "1.0", ?string $encoding = null, ?string $standalone = null): bool {}
-
-    /** @alias xmlwriter_end_document */
-    public function endDocument(): bool {}
-
-    /** @alias xmlwriter_write_comment */
-    public function writeComment(string $content): bool {}
-
-    /** @alias xmlwriter_start_dtd */
-    public function startDtd(string $qualifiedName, ?string $publicId = null, ?string $systemId = null): bool {}
-
-    /** @alias xmlwriter_end_dtd */
-    public function endDtd(): bool {}
-
-    /** @alias xmlwriter_write_dtd */
-    public function writeDtd(string $name, ?string $publicId = null, ?string $systemId = null, ?string $content = null): bool {}
-
-    /** @alias xmlwriter_start_dtd_element */
-    public function startDtdElement(string $qualifiedName): bool {}
-
-    /** @alias xmlwriter_end_dtd_element */
-    public function endDtdElement(): bool {}
-
-    /** @alias xmlwriter_write_dtd_element */
-    public function writeDtdElement(string $name, string $content): bool {}
-
-    /** @alias xmlwriter_start_dtd_attlist */
-    public function startDtdAttlist(string $name): bool {}
-
-    /** @alias xmlwriter_end_dtd_attlist */
-    public function endDtdAttlist(): bool {}
-
-    /** @alias xmlwriter_write_dtd_attlist */
-    public function writeDtdAttlist(string $name, string $content): bool {}
-
-    /** @alias xmlwriter_start_dtd_entity */
-    public function startDtdEntity(string $name, bool $isParam): bool {}
-
-    /** @alias xmlwriter_end_dtd_entity */
-    public function endDtdEntity(): bool {}
-
-    /** @alias xmlwriter_write_dtd_entity */
-    public function writeDtdEntity(string $name, string $content, bool $isParam = false, ?string $publicId = null, ?string $systemId = null, ?string $notationData = null): bool {}
-
-    /** @alias xmlwriter_output_memory */
-    public function outputMemory(bool $flush = true): string {}
-
-    /** @alias xmlwriter_flush */
-    public function flush(bool $empty = true): string|int {}
+    /**
+     * @return bool
+     * @alias xmlwriter_open_uri
+     */
+    public function openUri(string $uri) {}
+
+    /**
+     * @return bool
+     * @alias xmlwriter_open_memory
+     */
+    public function openMemory() {}
+
+    /**
+     * @return bool
+     * @alias xmlwriter_set_indent
+     */
+    public function setIndent(bool $enable) {}
+
+    /**
+     * @return bool
+     * @alias xmlwriter_set_indent_string
+     */
+    public function setIndentString(string $indentation) {}
+
+    /**
+     * @return bool
+     * @alias xmlwriter_start_comment
+     */
+    public function startComment() {}
+
+    /**
+     * @return bool
+     * @alias xmlwriter_end_comment
+     */
+    public function endComment() {}
+
+    /**
+     * @return bool
+     * @alias xmlwriter_start_attribute
+     */
+    public function startAttribute(string $name) {}
+
+    /**
+     * @return bool
+     * @alias xmlwriter_end_attribute
+     */
+    public function endAttribute() {}
+
+    /**
+     * @return bool
+     * @alias xmlwriter_write_attribute
+     */
+    public function writeAttribute(string $name, string $value) {}
+
+    /**
+     * @return bool
+     * @alias xmlwriter_start_attribute_ns
+     */
+    public function startAttributeNs(?string $prefix, string $name, ?string $namespace) {}
+
+    /**
+     * @return bool
+     * @alias xmlwriter_write_attribute_ns
+     */
+    public function writeAttributeNs(?string $prefix, string $name, ?string $namespace, string $value) {}
+
+    /**
+     * @return bool
+     * @alias xmlwriter_start_element
+     */
+    public function startElement(string $name) {}
+
+    /**
+     * @return bool
+     * @alias xmlwriter_end_element
+     */
+    public function endElement() {}
+
+    /**
+     * @return bool
+     * @alias xmlwriter_full_end_element
+     */
+    public function fullEndElement() {}
+
+    /**
+     * @return bool
+     * @alias xmlwriter_start_element_ns
+     */
+    public function startElementNs(?string $prefix, string $name, ?string $namespace) {}
+
+    /**
+     * @return bool
+     * @alias xmlwriter_write_element
+     */
+    public function writeElement(string $name, ?string $content = null) {}
+
+    /**
+     * @return bool
+     * @alias xmlwriter_write_element_ns
+     */
+    public function writeElementNs(?string $prefix, string $name, ?string $namespace, ?string $content = null) {}
+
+    /**
+     * @return bool
+     * @alias xmlwriter_start_pi
+     */
+    public function startPi(string $target) {}
+
+    /**
+     * @return bool
+     * @alias xmlwriter_end_pi
+     */
+    public function endPi() {}
+
+    /**
+     * @return bool
+     * @alias xmlwriter_write_pi
+     */
+    public function writePi(string $target, string $content) {}
+
+    /**
+     * @return bool
+     * @alias xmlwriter_start_cdata
+     */
+    public function startCdata() {}
+
+    /**
+     * @return bool
+     * @alias xmlwriter_end_cdata
+     * */
+    public function endCdata() {}
+
+    /**
+     * @return bool
+     * @alias xmlwriter_write_cdata
+     */
+    public function writeCdata(string $content) {}
+
+    /**
+     * @return bool
+     * @alias xmlwriter_text
+     */
+    public function text(string $content) {}
+
+    /**
+     * @return bool
+     * @alias xmlwriter_write_raw
+     */
+    public function writeRaw(string $content) {}
+
+    /**
+     * @return bool
+     * @alias xmlwriter_start_document
+     */
+    public function startDocument(?string $version = "1.0", ?string $encoding = null, ?string $standalone = null) {}
+
+    /**
+     * @return bool
+     * @alias xmlwriter_end_document
+     */
+    public function endDocument() {}
+
+    /**
+     * @return bool
+     * @alias xmlwriter_write_comment
+     */
+    public function writeComment(string $content) {}
+
+    /**
+     * @return bool
+     * @alias xmlwriter_start_dtd
+     */
+    public function startDtd(string $qualifiedName, ?string $publicId = null, ?string $systemId = null) {}
+
+    /**
+     * @return bool
+     * @alias xmlwriter_end_dtd
+     */
+    public function endDtd() {}
+
+    /**
+     * @return bool
+     * @alias xmlwriter_write_dtd
+     */
+    public function writeDtd(string $name, ?string $publicId = null, ?string $systemId = null, ?string $content = null) {}
+
+    /**
+     * @return bool
+     * @alias xmlwriter_start_dtd_element
+     */
+    public function startDtdElement(string $qualifiedName) {}
+
+    /**
+     * @return bool
+     * @alias xmlwriter_end_dtd_element
+     */
+    public function endDtdElement() {}
+
+    /**
+     * @return bool
+     * @alias xmlwriter_write_dtd_element
+     */
+    public function writeDtdElement(string $name, string $content) {}
+
+    /**
+     * @return bool
+     * @alias xmlwriter_start_dtd_attlist
+     */
+    public function startDtdAttlist(string $name) {}
+
+    /**
+     * @return bool
+     * @alias xmlwriter_end_dtd_attlist
+     */
+    public function endDtdAttlist() {}
+
+    /**
+     * @return bool
+     * @alias xmlwriter_write_dtd_attlist
+     */
+    public function writeDtdAttlist(string $name, string $content) {}
+
+    /**
+     * @return bool
+     * @alias xmlwriter_start_dtd_entity
+     */
+    public function startDtdEntity(string $name, bool $isParam) {}
+
+    /**
+     * @return bool
+     * @alias xmlwriter_end_dtd_entity
+     */
+    public function endDtdEntity() {}
+
+    /**
+     * @return bool
+     * @alias xmlwriter_write_dtd_entity
+     */
+    public function writeDtdEntity(string $name, string $content, bool $isParam = false, ?string $publicId = null, ?string $systemId = null, ?string $notationData = null) {}
+
+    /**
+     * @return string
+     * @alias xmlwriter_output_memory
+     */
+    public function outputMemory(bool $flush = true) {}
+
+    /**
+     * @return string|int
+     * @alias xmlwriter_flush
+     */
+    public function flush(bool $empty = true) {}
 }

diff --git a/ext/xmlwriter/php_xmlwriter_arginfo.h b/ext/xmlwriter/php_xmlwriter_arginfo.h
index 3a3b52eef711c6bd5f92420503d299747f130d13..b7af463c4e9fd5392eb6c4602c4f511f65dc1d8c 100644 (file)
--- 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: 891054e4aaf1d24b0965828de8287392b6a389a3 */
+ * Stub hash: df2a62a48636bd2c7b1e62ac28480ae27233f100 */
 
 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)
@@ -175,18 +175,18 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_xmlwriter_flush, 0, 1, MAY_BE_ST
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, empty, _IS_BOOL, 0, "true")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_XMLWriter_openUri, 0, 1, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_XMLWriter_openUri, 0, 0, 1)
        ZEND_ARG_TYPE_INFO(0, uri, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_XMLWriter_openMemory, 0, 0, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_XMLWriter_openMemory, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_XMLWriter_setIndent, 0, 1, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_XMLWriter_setIndent, 0, 0, 1)
        ZEND_ARG_TYPE_INFO(0, enable, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_XMLWriter_setIndentString, 0, 1, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_XMLWriter_setIndentString, 0, 0, 1)
        ZEND_ARG_TYPE_INFO(0, indentation, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
@@ -194,24 +194,24 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_class_XMLWriter_endComment arginfo_class_XMLWriter_openMemory
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_XMLWriter_startAttribute, 0, 1, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_XMLWriter_startAttribute, 0, 0, 1)
        ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_XMLWriter_endAttribute arginfo_class_XMLWriter_openMemory
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_XMLWriter_writeAttribute, 0, 2, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_XMLWriter_writeAttribute, 0, 0, 2)
        ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
        ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_XMLWriter_startAttributeNs, 0, 3, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_XMLWriter_startAttributeNs, 0, 0, 3)
        ZEND_ARG_TYPE_INFO(0, prefix, IS_STRING, 1)
        ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
        ZEND_ARG_TYPE_INFO(0, namespace, IS_STRING, 1)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_XMLWriter_writeAttributeNs, 0, 4, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_XMLWriter_writeAttributeNs, 0, 0, 4)
        ZEND_ARG_TYPE_INFO(0, prefix, IS_STRING, 1)
        ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
        ZEND_ARG_TYPE_INFO(0, namespace, IS_STRING, 1)
@@ -226,25 +226,25 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_class_XMLWriter_startElementNs arginfo_class_XMLWriter_startAttributeNs
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_XMLWriter_writeElement, 0, 1, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_XMLWriter_writeElement, 0, 0, 1)
        ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, content, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_XMLWriter_writeElementNs, 0, 3, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_XMLWriter_writeElementNs, 0, 0, 3)
        ZEND_ARG_TYPE_INFO(0, prefix, IS_STRING, 1)
        ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
        ZEND_ARG_TYPE_INFO(0, namespace, IS_STRING, 1)
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, content, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_XMLWriter_startPi, 0, 1, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_XMLWriter_startPi, 0, 0, 1)
        ZEND_ARG_TYPE_INFO(0, target, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_XMLWriter_endPi arginfo_class_XMLWriter_openMemory
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_XMLWriter_writePi, 0, 2, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_XMLWriter_writePi, 0, 0, 2)
        ZEND_ARG_TYPE_INFO(0, target, IS_STRING, 0)
        ZEND_ARG_TYPE_INFO(0, content, IS_STRING, 0)
 ZEND_END_ARG_INFO()
@@ -253,7 +253,7 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_class_XMLWriter_endCdata arginfo_class_XMLWriter_openMemory
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_XMLWriter_writeCdata, 0, 1, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_XMLWriter_writeCdata, 0, 0, 1)
        ZEND_ARG_TYPE_INFO(0, content, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
@@ -261,7 +261,7 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_class_XMLWriter_writeRaw arginfo_class_XMLWriter_writeCdata
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_XMLWriter_startDocument, 0, 0, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_XMLWriter_startDocument, 0, 0, 0)
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, version, IS_STRING, 1, "\"1.0\"")
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, encoding, IS_STRING, 1, "null")
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, standalone, IS_STRING, 1, "null")
@@ -271,7 +271,7 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_class_XMLWriter_writeComment arginfo_class_XMLWriter_writeCdata
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_XMLWriter_startDtd, 0, 1, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_XMLWriter_startDtd, 0, 0, 1)
        ZEND_ARG_TYPE_INFO(0, qualifiedName, IS_STRING, 0)
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, publicId, IS_STRING, 1, "null")
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, systemId, IS_STRING, 1, "null")
@@ -279,20 +279,20 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_class_XMLWriter_endDtd arginfo_class_XMLWriter_openMemory
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_XMLWriter_writeDtd, 0, 1, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_XMLWriter_writeDtd, 0, 0, 1)
        ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, publicId, IS_STRING, 1, "null")
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, systemId, IS_STRING, 1, "null")
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, content, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_XMLWriter_startDtdElement, 0, 1, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_XMLWriter_startDtdElement, 0, 0, 1)
        ZEND_ARG_TYPE_INFO(0, qualifiedName, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_XMLWriter_endDtdElement arginfo_class_XMLWriter_openMemory
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_XMLWriter_writeDtdElement, 0, 2, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_XMLWriter_writeDtdElement, 0, 0, 2)
        ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
        ZEND_ARG_TYPE_INFO(0, content, IS_STRING, 0)
 ZEND_END_ARG_INFO()
@@ -303,14 +303,14 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_class_XMLWriter_writeDtdAttlist arginfo_class_XMLWriter_writeDtdElement
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_XMLWriter_startDtdEntity, 0, 2, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_XMLWriter_startDtdEntity, 0, 0, 2)
        ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
        ZEND_ARG_TYPE_INFO(0, isParam, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_XMLWriter_endDtdEntity arginfo_class_XMLWriter_openMemory
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_XMLWriter_writeDtdEntity, 0, 2, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_XMLWriter_writeDtdEntity, 0, 0, 2)
        ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
        ZEND_ARG_TYPE_INFO(0, content, IS_STRING, 0)
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, isParam, _IS_BOOL, 0, "false")
@@ -319,11 +319,11 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_XMLWriter_writeDtdEntity,
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, notationData, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_XMLWriter_outputMemory, 0, 0, IS_STRING, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_XMLWriter_outputMemory, 0, 0, 0)
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flush, _IS_BOOL, 0, "true")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_class_XMLWriter_flush, 0, 0, MAY_BE_STRING|MAY_BE_LONG)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_XMLWriter_flush, 0, 0, 0)
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, empty, _IS_BOOL, 0, "true")
 ZEND_END_ARG_INFO()