Don't specify method return values in stubs

We also fix the @return annotation of `::open()` and `::XML()`, which
return an `XMLReader` instance when called statically.

2 files changed, 56 insertions, 45 deletions

diff --git a/ext/xmlreader/xmlreader.stub.php b/ext/xmlreader/xmlreader.stub.php
index 1510430755..6608e60768 100644
--- a/ext/xmlreader/xmlreader.stub.php
+++ b/ext/xmlreader/xmlreader.stub.php
@@ -2,56 +2,77 @@
 
 class XMLReader
 {
-    function close(): bool {}
+    /** @return bool */
+    function close() {}
 
     /** @return string|null|false */
     function getAttribute(string $name) {}
 
-    function getAttributeNo(int $index): ?string {}
+    /** @return ?string */
+    function getAttributeNo(int $index) {}
 
     /** @return string|null|false */
     function getAttributeNs(string $name, string $namespaceURI) {}
 
-    function getParserProperty(int $property): bool {}
+    /** @return bool */
+    function getParserProperty(int $property) {}
 
-    function isValid(): bool {}
+    /** @return bool */
+    function isValid() {}
 
     /** @return string|null|false */
     function lookupNamespace(string $prefix) {}
 
-    function moveToAttribute(string $name): bool {}
+    /** @return bool */
+    function moveToAttribute(string $name) {}
 
-    function moveToAttributeNo(int $index): bool {}
+    /** @return bool */
+    function moveToAttributeNo(int $index) {}
 
-    function moveToAttributeNs(string $name, string $namespaceURI): bool {}
+    /** @return bool */
+    function moveToAttributeNs(string $name, string $namespaceURI) {}
 
-    function moveToElement(): bool {}
+    /** @return bool */
+    function moveToElement() {}
 
-    function moveToFirstAttribute(): bool {}
+    /** @return bool */
+    function moveToFirstAttribute() {}
 
-    function moveToNextAttribute(): bool {}
+    /** @return bool */
+    function moveToNextAttribute() {}
 
-    function read(): bool {}
+    /** @return bool */
+    function read() {}
 
-    function next(string $localname = UNKNOWN): bool {}
+    /** @return bool */
+    function next(string $localname = UNKNOWN) {}
 
-    function open(string $URI, ?string $encoding = null, int $options = 0): bool {}
+    /** @return bool|XMLReader */
+    function open(string $URI, ?string $encoding = null, int $options = 0) {}
 
-    function readInnerXml(): string {}
+    /** @return string */
+    function readInnerXml() {}
 
-    function readOuterXml(): string {}
+    /** @return string */
+    function readOuterXml() {}
 
-    function readString(): string {}
+    /** @return string */
+    function readString() {}
 
+    /** @return bool */
     function setSchema(?string $filename) {}
 
-    function setParserProperty(int $property, bool $value): bool {}
+    /** @return bool */
+    function setParserProperty(int $property, bool $value) {}
 
-    function setRelaxNGSchema(?string $filename): bool {}
+    /** @return bool */
+    function setRelaxNGSchema(?string $filename) {}
 
-    function setRelaxNGSchemaSource(?string $source): bool {}
+    /** @return bool */
+    function setRelaxNGSchemaSource(?string $source) {}
 
-    function XML(string $source, ?string $encoding = null, int $options = 0): bool {}
+    /** @return bool|XMLReader */
+    function XML(string $source, ?string $encoding = null, int $options = 0) {}
 
     /** @return DOMNode|bool */
     function expand(?DOMNode $basenode = null) {}
diff --git a/ext/xmlreader/xmlreader_arginfo.h b/ext/xmlreader/xmlreader_arginfo.h
index 14df4d2132..2c93edeee6 100644
--- a/ext/xmlreader/xmlreader_arginfo.h
+++ b/ext/xmlreader/xmlreader_arginfo.h
@@ -1,13 +1,13 @@
 /* This is a generated file, edit the .stub.php file instead. */
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_XMLReader_close, 0, 0, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_XMLReader_close, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_XMLReader_getAttribute, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_XMLReader_getAttributeNo, 0, 1, IS_STRING, 1)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_XMLReader_getAttributeNo, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, index, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
@@ -16,7 +16,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_XMLReader_getAttributeNs, 0, 0, 2)
 	ZEND_ARG_TYPE_INFO(0, namespaceURI, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_XMLReader_getParserProperty, 0, 1, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_XMLReader_getParserProperty, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, property, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
@@ -26,18 +26,11 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_XMLReader_lookupNamespace, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, prefix, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_XMLReader_moveToAttribute, 0, 1, _IS_BOOL, 0)
-	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
-ZEND_END_ARG_INFO()
+#define arginfo_class_XMLReader_moveToAttribute arginfo_class_XMLReader_getAttribute
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_XMLReader_moveToAttributeNo, 0, 1, _IS_BOOL, 0)
-	ZEND_ARG_TYPE_INFO(0, index, IS_LONG, 0)
-ZEND_END_ARG_INFO()
+#define arginfo_class_XMLReader_moveToAttributeNo arginfo_class_XMLReader_getAttributeNo
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_XMLReader_moveToAttributeNs, 0, 2, _IS_BOOL, 0)
-	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, namespaceURI, IS_STRING, 0)
-ZEND_END_ARG_INFO()
+#define arginfo_class_XMLReader_moveToAttributeNs arginfo_class_XMLReader_getAttributeNs
 
 #define arginfo_class_XMLReader_moveToElement arginfo_class_XMLReader_close
 
@@ -47,41 +40,38 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_class_XMLReader_read arginfo_class_XMLReader_close
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_XMLReader_next, 0, 0, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_XMLReader_next, 0, 0, 0)
 	ZEND_ARG_TYPE_INFO(0, localname, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_XMLReader_open, 0, 1, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_XMLReader_open, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, URI, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, encoding, IS_STRING, 1)
 	ZEND_ARG_TYPE_INFO(0, options, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_XMLReader_readInnerXml, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
+#define arginfo_class_XMLReader_readInnerXml arginfo_class_XMLReader_close
 
-#define arginfo_class_XMLReader_readOuterXml arginfo_class_XMLReader_readInnerXml
+#define arginfo_class_XMLReader_readOuterXml arginfo_class_XMLReader_close
 
-#define arginfo_class_XMLReader_readString arginfo_class_XMLReader_readInnerXml
+#define arginfo_class_XMLReader_readString arginfo_class_XMLReader_close
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_XMLReader_setSchema, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 1)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_XMLReader_setParserProperty, 0, 2, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_XMLReader_setParserProperty, 0, 0, 2)
 	ZEND_ARG_TYPE_INFO(0, property, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, value, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_XMLReader_setRelaxNGSchema, 0, 1, _IS_BOOL, 0)
-	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 1)
-ZEND_END_ARG_INFO()
+#define arginfo_class_XMLReader_setRelaxNGSchema arginfo_class_XMLReader_setSchema
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_XMLReader_setRelaxNGSchemaSource, 0, 1, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_XMLReader_setRelaxNGSchemaSource, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, source, IS_STRING, 1)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_XMLReader_XML, 0, 1, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_XMLReader_XML, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, source, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, encoding, IS_STRING, 1)
 	ZEND_ARG_TYPE_INFO(0, options, IS_LONG, 0)