Review parameter names in ext/xmlreader

Closes GH-6255.
This commit is contained in:
Dik Takken 2020-10-01 20:55:36 +02:00 committed by Nikita Popov
parent 3eae7aa77e
commit a7856c1bae
5 changed files with 16 additions and 16 deletions

View file

@ -14,7 +14,7 @@ class XMLReader
public function getAttributeNo(int $index) {}
/** @return string|null */
public function getAttributeNs(string $name, string $namespaceURI) {}
public function getAttributeNs(string $name, string $uri) {}
/** @return bool */
public function getParserProperty(int $property) {}
@ -32,7 +32,7 @@ class XMLReader
public function moveToAttributeNo(int $index) {}
/** @return bool */
public function moveToAttributeNs(string $name, string $namespaceURI) {}
public function moveToAttributeNs(string $name, string $uri) {}
/** @return bool */
public function moveToElement() {}
@ -47,10 +47,10 @@ class XMLReader
public function read() {}
/** @return bool */
public function next(?string $localname = null) {}
public function next(?string $name = null) {}
/** @return bool|XMLReader */
public static function open(string $URI, ?string $encoding = null, int $options = 0) {}
public static function open(string $uri, ?string $encoding = null, int $flags = 0) {}
/** @return string */
public function readInnerXml() {}
@ -74,8 +74,8 @@ class XMLReader
public function setRelaxNGSchemaSource(?string $source) {}
/** @return bool|XMLReader */
public static function XML(string $source, ?string $encoding = null, int $options = 0) {}
public static function XML(string $source, ?string $encoding = null, int $flags = 0) {}
/** @return DOMNode|false */
public function expand(?DOMNode $basenode = null) {}
public function expand(?DOMNode $baseNode = null) {}
}

View file

@ -1,5 +1,5 @@
/* This is a generated file, edit the .stub.php file instead.
* Stub hash: 7d549429c217e5c3b9c36013b6737f4e8eeccbb6 */
* Stub hash: b5860285a7554c75780be7989bcbdeced6b557c8 */
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_XMLReader_close, 0, 0, 0)
ZEND_END_ARG_INFO()
@ -14,7 +14,7 @@ ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_XMLReader_getAttributeNs, 0, 0, 2)
ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
ZEND_ARG_TYPE_INFO(0, namespaceURI, IS_STRING, 0)
ZEND_ARG_TYPE_INFO(0, uri, IS_STRING, 0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_XMLReader_getParserProperty, 0, 0, 1)
@ -42,13 +42,13 @@ ZEND_END_ARG_INFO()
#define arginfo_class_XMLReader_read arginfo_class_XMLReader_close
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_XMLReader_next, 0, 0, 0)
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, localname, IS_STRING, 1, "null")
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, name, IS_STRING, 1, "null")
ZEND_END_ARG_INFO()
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, uri, IS_STRING, 0)
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, encoding, IS_STRING, 1, "null")
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_LONG, 0, "0")
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0")
ZEND_END_ARG_INFO()
#define arginfo_class_XMLReader_readInnerXml arginfo_class_XMLReader_close
@ -75,11 +75,11 @@ ZEND_END_ARG_INFO()
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_WITH_DEFAULT_VALUE(0, encoding, IS_STRING, 1, "null")
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_LONG, 0, "0")
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0")
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_XMLReader_expand, 0, 0, 0)
ZEND_ARG_OBJ_INFO_WITH_DEFAULT_VALUE(0, basenode, DOMNode, 1, "null")
ZEND_ARG_OBJ_INFO_WITH_DEFAULT_VALUE(0, baseNode, DOMNode, 1, "null")
ZEND_END_ARG_INFO()

View file

@ -36,6 +36,6 @@ unlink($filename);
?>
--EXPECT--
XMLReader::open(): Argument #1 ($URI) cannot be empty
XMLReader::open(): Argument #1 ($uri) cannot be empty
books
books

View file

@ -46,5 +46,5 @@ $reader->close();
unlink(__DIR__.'/015-get-errors.xml');
?>
--EXPECT--
XMLReader::getAttributeNs(): Argument #2 ($namespaceURI) cannot be empty
XMLReader::getAttributeNs(): Argument #2 ($uri) cannot be empty
ns1:num: 1

View file

@ -41,4 +41,4 @@ $reader->close();
unlink(__DIR__.'/015-move-errors.xml');
?>
--EXPECT--
XMLReader::moveToAttributeNs(): Argument #2 ($namespaceURI) cannot be empty
XMLReader::moveToAttributeNs(): Argument #2 ($uri) cannot be empty