Declare nullable arguments in stubs

2 files changed, 55 insertions, 46 deletions

diff --git a/ext/xmlwriter/xmlwriter.stub.php b/ext/xmlwriter/xmlwriter.stub.php
index 857655e5b9..00efb8844d 100644
--- a/ext/xmlwriter/xmlwriter.stub.php
+++ b/ext/xmlwriter/xmlwriter.stub.php
@@ -28,10 +28,10 @@ function xmlwriter_end_attribute($xmlwriter): bool {}
 function xmlwriter_write_attribute($xmlwriter, string $name, string $value): bool {}
 
 /** @param resource $xmlwriter */
-function xmlwriter_start_attribute_ns($xmlwriter, string $prefix, string $name, string $uri): bool {}
+function xmlwriter_start_attribute_ns($xmlwriter, string $prefix, string $name, ?string $uri): bool {}
 
 /** @param resource $xmlwriter */
-function xmlwriter_write_attribute_ns($xmlwriter, string $prefix, string $name, string $uri, string $content): bool {}
+function xmlwriter_write_attribute_ns($xmlwriter, string $prefix, string $name, ?string $uri, string $content): bool {}
 
 /** @param resource $xmlwriter */
 function xmlwriter_start_element($xmlwriter, string $name): bool {}
@@ -43,13 +43,13 @@ function xmlwriter_end_element($xmlwriter): bool {}
 function xmlwriter_full_end_element($xmlwriter): bool {}
 
 /** @param resource $xmlwriter */
-function xmlwriter_start_element_ns($xmlwriter, string $prefix, string $name, string $uri): bool {}
+function xmlwriter_start_element_ns($xmlwriter, ?string $prefix, string $name, ?string $uri): bool {}
 
 /** @param resource $xmlwriter */
-function xmlwriter_write_element($xmlwriter, string $name, string $content = UNKNOWN): bool {}
+function xmlwriter_write_element($xmlwriter, string $name, ?string $content = null): bool {}
 
 /** @param resource $xmlwriter */
-function xmlwriter_write_element_ns($xmlwriter, string $prefix, string $name, string $uri, string $content = UNKNOWN): bool {}
+function xmlwriter_write_element_ns($xmlwriter, ?string $prefix, string $name, ?string $uri, ?string $content = null): bool {}
 
 /** @param resource $xmlwriter */
 function xmlwriter_start_pi($xmlwriter, string $target): bool {}
@@ -76,7 +76,7 @@ function xmlwriter_text($xmlwriter, string $content): bool {}
 function xmlwriter_write_raw($xmlwriter, string $content): bool {}
 
 /** @param resource $xmlwriter */
-function xmlwriter_start_document($xmlwriter, string $version = '1.0', $encoding = UNKNOWN, $standalone = UNKNOWN) {}
+function xmlwriter_start_document($xmlwriter, ?string $version = '1.0', ?string $encoding = null, ?string $standalone = null) {}
 
 /** @param resource $xmlwriter */
 function xmlwriter_end_document($xmlwriter): bool {}
@@ -85,13 +85,13 @@ function xmlwriter_end_document($xmlwriter): bool {}
 function xmlwriter_write_comment($xmlwriter, string $content): bool {}
 
 /** @param resource $xmlwriter */
-function xmlwriter_start_dtd($xmlwriter, string $qualifiedName, string $publicId = UNKNOWN, string $systemId = UNKNOWN): bool {}
+function xmlwriter_start_dtd($xmlwriter, string $qualifiedName, ?string $publicId = null, ?string $systemId = null): bool {}
 
 /** @param resource $xmlwriter */
 function xmlwriter_end_dtd($xmlwriter): bool {}
 
 /** @param resource $xmlwriter */
-function xmlwriter_write_dtd($xmlwriter, string $name, $publicId = UNKNOWN, $systemId = UNKNOWN, $subset = UNKNOWN): bool {}
+function xmlwriter_write_dtd($xmlwriter, string $name, ?string $publicId = null, ?string $systemId = null, ?string $subset = null): bool {}
 
 /** @param resource $xmlwriter */
 function xmlwriter_start_dtd_element($xmlwriter, string $qualifiedName): bool {}
@@ -149,9 +149,9 @@ class XMLWriter
 
     function writeAttribute(string $name, string $value): bool {}
 
-    function startAttributeNs(string $prefix, string $name, string $uri): bool {}
+    function startAttributeNs(string $prefix, string $name, ?string $uri): bool {}
 
-    function writeAttributeNs(string $prefix, string $name, string $uri, string $content): bool {}
+    function writeAttributeNs(string $prefix, string $name, ?string $uri, string $content): bool {}
 
     function startElement(string $name): bool {}
 
@@ -159,11 +159,11 @@ class XMLWriter
 
     function fullEndElement(): bool {}
 
-    function startElementNs(string $prefix, string $name, string $uri): bool {}
+    function startElementNs(?string $prefix, string $name, ?string $uri): bool {}
 
-    function writeElement(string $name, string $content = UNKNOWN): bool {}
+    function writeElement(string $name, ?string $content = null): bool {}
 
-    function writeElementNs(string $prefix, string $name, string $uri, string $content = UNKNOWN): bool {}
+    function writeElementNs(?string $prefix, string $name, ?string $uri, ?string $content = null): bool {}
 
     function startPi(string $target): bool {}
 
@@ -181,17 +181,17 @@ class XMLWriter
 
     function writeRaw(string $content): bool {}
 
-    function startDocument(string $version = '1.0', string $encoding = UNKNOWN, string $standalone = UNKNOWN): bool {}
+    function startDocument(?string $version = '1.0', ?string $encoding = null, ?string $standalone = null): bool {}
 
     function endDocument(): bool {}
 
     function writeComment(string $content): bool {}
 
-    function startDtd(string $qualifiedName, string $publicId = UNKNOWN, string $systemId = UNKNOWN): bool {}
+    function startDtd(string $qualifiedName, ?string $publicId = null, ?string $systemId = null): bool {}
 
     function endDtd(): bool {}
 
-    function writeDtd(string $name, string $publicId = UNKNOWN, string $systemId = UNKNOWN, string $subset = UNKNOWN): bool {}
+    function writeDtd(string $name, ?string $publicId = null, ?string $systemId = null, ?string $subset = null): bool {}
 
     function startDtdElement(string $qualifiedName): bool {}
 
diff --git a/ext/xmlwriter/xmlwriter_arginfo.h b/ext/xmlwriter/xmlwriter_arginfo.h
index 90788a1ed4..3a421f4bd7 100644
--- a/ext/xmlwriter/xmlwriter_arginfo.h
+++ b/ext/xmlwriter/xmlwriter_arginfo.h
@@ -40,14 +40,14 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_xmlwriter_start_attribute_ns, 0,
 	ZEND_ARG_INFO(0, xmlwriter)
 	ZEND_ARG_TYPE_INFO(0, prefix, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, uri, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, uri, IS_STRING, 1)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_xmlwriter_write_attribute_ns, 0, 5, _IS_BOOL, 0)
 	ZEND_ARG_INFO(0, xmlwriter)
 	ZEND_ARG_TYPE_INFO(0, prefix, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, uri, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, uri, IS_STRING, 1)
 	ZEND_ARG_TYPE_INFO(0, content, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
@@ -57,20 +57,25 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_xmlwriter_full_end_element arginfo_xmlwriter_start_comment
 
-#define arginfo_xmlwriter_start_element_ns arginfo_xmlwriter_start_attribute_ns
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_xmlwriter_start_element_ns, 0, 4, _IS_BOOL, 0)
+	ZEND_ARG_INFO(0, xmlwriter)
+	ZEND_ARG_TYPE_INFO(0, prefix, IS_STRING, 1)
+	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, uri, IS_STRING, 1)
+ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_xmlwriter_write_element, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_INFO(0, xmlwriter)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, content, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, content, IS_STRING, 1)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_xmlwriter_write_element_ns, 0, 4, _IS_BOOL, 0)
 	ZEND_ARG_INFO(0, xmlwriter)
-	ZEND_ARG_TYPE_INFO(0, prefix, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, prefix, IS_STRING, 1)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, uri, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, content, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, uri, IS_STRING, 1)
+	ZEND_ARG_TYPE_INFO(0, content, IS_STRING, 1)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_xmlwriter_start_pi, 0, 2, _IS_BOOL, 0)
@@ -101,9 +106,9 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_start_document, 0, 0, 1)
 	ZEND_ARG_INFO(0, xmlwriter)
-	ZEND_ARG_TYPE_INFO(0, version, IS_STRING, 0)
-	ZEND_ARG_INFO(0, encoding)
-	ZEND_ARG_INFO(0, standalone)
+	ZEND_ARG_TYPE_INFO(0, version, IS_STRING, 1)
+	ZEND_ARG_TYPE_INFO(0, encoding, IS_STRING, 1)
+	ZEND_ARG_TYPE_INFO(0, standalone, IS_STRING, 1)
 ZEND_END_ARG_INFO()
 
 #define arginfo_xmlwriter_end_document arginfo_xmlwriter_start_comment
@@ -113,8 +118,8 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_xmlwriter_start_dtd, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_INFO(0, xmlwriter)
 	ZEND_ARG_TYPE_INFO(0, qualifiedName, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, publicId, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, systemId, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, publicId, IS_STRING, 1)
+	ZEND_ARG_TYPE_INFO(0, systemId, IS_STRING, 1)
 ZEND_END_ARG_INFO()
 
 #define arginfo_xmlwriter_end_dtd arginfo_xmlwriter_start_comment
@@ -122,9 +127,9 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_xmlwriter_write_dtd, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_INFO(0, xmlwriter)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
-	ZEND_ARG_INFO(0, publicId)
-	ZEND_ARG_INFO(0, systemId)
-	ZEND_ARG_INFO(0, subset)
+	ZEND_ARG_TYPE_INFO(0, publicId, IS_STRING, 1)
+	ZEND_ARG_TYPE_INFO(0, systemId, IS_STRING, 1)
+	ZEND_ARG_TYPE_INFO(0, subset, IS_STRING, 1)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_xmlwriter_start_dtd_element, 0, 2, _IS_BOOL, 0)
@@ -207,13 +212,13 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_XMLWriter_startAttributeNs, 0, 3, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, prefix, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, uri, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, uri, 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_ARG_TYPE_INFO(0, prefix, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, uri, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, uri, IS_STRING, 1)
 	ZEND_ARG_TYPE_INFO(0, content, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
@@ -223,18 +228,22 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_class_XMLWriter_fullEndElement arginfo_class_XMLWriter_openMemory
 
-#define arginfo_class_XMLWriter_startElementNs arginfo_class_XMLWriter_startAttributeNs
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_XMLWriter_startElementNs, 0, 3, _IS_BOOL, 0)
+	ZEND_ARG_TYPE_INFO(0, prefix, IS_STRING, 1)
+	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, uri, IS_STRING, 1)
+ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_XMLWriter_writeElement, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, content, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, content, IS_STRING, 1)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_XMLWriter_writeElementNs, 0, 3, _IS_BOOL, 0)
-	ZEND_ARG_TYPE_INFO(0, prefix, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, prefix, IS_STRING, 1)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, uri, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, content, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, uri, IS_STRING, 1)
+	ZEND_ARG_TYPE_INFO(0, content, IS_STRING, 1)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_XMLWriter_startPi, 0, 1, _IS_BOOL, 0)
@@ -261,9 +270,9 @@ 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_ARG_TYPE_INFO(0, version, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, encoding, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, standalone, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, version, IS_STRING, 1)
+	ZEND_ARG_TYPE_INFO(0, encoding, IS_STRING, 1)
+	ZEND_ARG_TYPE_INFO(0, standalone, IS_STRING, 1)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_XMLWriter_endDocument arginfo_class_XMLWriter_openMemory
@@ -272,17 +281,17 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_XMLWriter_startDtd, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, qualifiedName, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, publicId, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, systemId, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, publicId, IS_STRING, 1)
+	ZEND_ARG_TYPE_INFO(0, systemId, IS_STRING, 1)
 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_ARG_TYPE_INFO(0, name, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, publicId, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, systemId, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, subset, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, publicId, IS_STRING, 1)
+	ZEND_ARG_TYPE_INFO(0, systemId, IS_STRING, 1)
+	ZEND_ARG_TYPE_INFO(0, subset, IS_STRING, 1)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_XMLWriter_startDtdElement, 0, 1, _IS_BOOL, 0)