From 184505733d5f2cad601000e2cae9e5cef219d0f2 Mon Sep 17 00:00:00 2001 From: Arnout Boks Date: Thu, 15 Jul 2021 14:52:19 +0200 Subject: [PATCH 1/5] Correct callmap entries for XMLWriter Checked and fixed the following, based on the current documentation in the PHP manual: * capitalization in method names * parameter names * parameter types (especially for nullable params) * return types (especially for '|false'-types) * differences between pre- and post-8.0.0-signatures Fixes #6091 --- dictionaries/CallMap.php | 78 ++++++------- dictionaries/CallMap_80_delta.php | 176 ++++++++++++++++-------------- 2 files changed, 131 insertions(+), 123 deletions(-) diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php index 1680325315a..0365d3041ce 100644 --- a/dictionaries/CallMap.php +++ b/dictionaries/CallMap.php @@ -15643,46 +15643,46 @@ 'xmlrpc_server_register_method' => ['bool', 'server'=>'resource', 'method_name'=>'string', 'function'=>'string'], 'xmlrpc_set_type' => ['bool', '&rw_value'=>'string|DateTime', 'type'=>'string'], 'XMLWriter::endAttribute' => ['bool'], -'XMLWriter::endCData' => ['bool'], +'XMLWriter::endCdata' => ['bool'], 'XMLWriter::endComment' => ['bool'], 'XMLWriter::endDocument' => ['bool'], -'XMLWriter::endDTD' => ['bool', 'xmlwriter='=>''], -'XMLWriter::endDTDAttlist' => ['bool'], -'XMLWriter::endDTDElement' => ['bool'], -'XMLWriter::endDTDEntity' => ['bool'], +'XMLWriter::endDtd' => ['bool'], +'XMLWriter::endDtdAttlist' => ['bool'], +'XMLWriter::endDtdElement' => ['bool'], +'XMLWriter::endDtdEntity' => ['bool'], 'XMLWriter::endElement' => ['bool'], -'XMLWriter::endPI' => ['bool'], -'XMLWriter::flush' => ['', 'empty='=>'bool', 'xmlwriter='=>''], +'XMLWriter::endPi' => ['bool'], +'XMLWriter::flush' => ['string|int|false', 'empty='=>'bool'], 'XMLWriter::fullEndElement' => ['bool'], 'XMLWriter::openMemory' => ['bool'], -'XMLWriter::openURI' => ['bool', 'uri'=>'string'], -'XMLWriter::outputMemory' => ['string', 'flush='=>'bool', 'xmlwriter='=>''], -'XMLWriter::setIndent' => ['bool', 'indent'=>'bool'], -'XMLWriter::setIndentString' => ['bool', 'indentstring'=>'string'], +'XMLWriter::openUri' => ['bool', 'uri'=>'string'], +'XMLWriter::outputMemory' => ['string', 'flush='=>'bool'], +'XMLWriter::setIndent' => ['bool', 'enable'=>'bool'], +'XMLWriter::setIndentString' => ['bool', 'indentation'=>'string'], 'XMLWriter::startAttribute' => ['bool', 'name'=>'string'], -'XMLWriter::startAttributeNS' => ['bool', 'prefix'=>'string', 'name'=>'string', 'uri'=>'string'], -'XMLWriter::startCData' => ['bool'], +'XMLWriter::startAttributeNs' => ['bool', 'prefix'=>'string', 'name'=>'string', 'namespace'=>'?string'], +'XMLWriter::startCdata' => ['bool'], 'XMLWriter::startComment' => ['bool'], -'XMLWriter::startDocument' => ['bool', 'version='=>'string', 'encoding='=>'string', 'standalone='=>'string'], -'XMLWriter::startDTD' => ['bool', 'qualifiedname'=>'string', 'publicid='=>'string', 'systemid='=>'string'], -'XMLWriter::startDTDAttlist' => ['bool', 'name'=>'string'], -'XMLWriter::startDTDElement' => ['bool', 'qualifiedname'=>'string'], -'XMLWriter::startDTDEntity' => ['bool', 'name'=>'string', 'isparam'=>'bool'], +'XMLWriter::startDocument' => ['bool', 'version='=>'?string', 'encoding='=>'?string', 'standalone='=>'?string'], +'XMLWriter::startDtd' => ['bool', 'qualifiedName'=>'string', 'publicId='=>'?string', 'systemId='=>'?string'], +'XMLWriter::startDtdAttlist' => ['bool', 'name'=>'string'], +'XMLWriter::startDtdElement' => ['bool', 'qualifiedName'=>'string'], +'XMLWriter::startDtdEntity' => ['bool', 'name'=>'string', 'isParam'=>'bool'], 'XMLWriter::startElement' => ['bool', 'name'=>'string'], -'XMLWriter::startElementNS' => ['bool', 'prefix'=>'string', 'name'=>'string', 'uri'=>'string'], -'XMLWriter::startPI' => ['bool', 'target'=>'string'], +'XMLWriter::startElementNs' => ['bool', 'prefix'=>'?string', 'name'=>'string', 'namespace'=>'?string'], +'XMLWriter::startPi' => ['bool', 'target'=>'string'], 'XMLWriter::text' => ['bool', 'content'=>'string'], 'XMLWriter::writeAttribute' => ['bool', 'name'=>'string', 'value'=>'string'], -'XMLWriter::writeAttributeNS' => ['bool', 'prefix'=>'string', 'name'=>'string', 'uri'=>'string', 'content'=>'string'], -'XMLWriter::writeCData' => ['bool', 'content'=>'string'], +'XMLWriter::writeAttributeNs' => ['bool', 'prefix'=>'string', 'name'=>'string', 'namespace'=>'string', 'value'=>'string'], +'XMLWriter::writeCdata' => ['bool', 'content'=>'string'], 'XMLWriter::writeComment' => ['bool', 'content'=>'string'], -'XMLWriter::writeDTD' => ['bool', 'name'=>'string', 'publicid='=>'string', 'systemid='=>'string', 'subset='=>'string'], -'XMLWriter::writeDTDAttlist' => ['bool', 'name'=>'string', 'content'=>'string'], -'XMLWriter::writeDTDElement' => ['bool', 'name'=>'string', 'content'=>'string'], -'XMLWriter::writeDTDEntity' => ['bool', 'name'=>'string', 'content'=>'string', 'pe'=>'bool', 'publicid'=>'string', 'sysid'=>'string', 'ndataid'=>'string'], +'XMLWriter::writeDtd' => ['bool', 'name'=>'string', 'publicId='=>'?string', 'systemId='=>'?string', 'content='=>'?string'], +'XMLWriter::writeDtdAttlist' => ['bool', 'name'=>'string', 'content'=>'string'], +'XMLWriter::writeDtdElement' => ['bool', 'name'=>'string', 'content'=>'string'], +'XMLWriter::writeDtdEntity' => ['bool', 'name'=>'string', 'content'=>'string', 'isParam'=>'bool', 'publicId'=>'string', 'systemId'=>'string', 'notationData'=>'string'], 'XMLWriter::writeElement' => ['bool', 'name'=>'string', 'content='=>'?string'], -'XMLWriter::writeElementNS' => ['bool', 'prefix'=>'string', 'name'=>'string', 'uri'=>'string', 'content='=>'?string'], -'XMLWriter::writePI' => ['bool', 'target'=>'string', 'content'=>'string'], +'XMLWriter::writeElementNs' => ['bool', 'prefix'=>'?string', 'name'=>'string', 'namespace'=>'?string', 'content='=>'?string'], +'XMLWriter::writePi' => ['bool', 'target'=>'string', 'content'=>'string'], 'XMLWriter::writeRaw' => ['bool', 'content'=>'string'], 'xmlwriter_end_attribute' => ['bool', 'writer'=>'resource'], 'xmlwriter_end_cdata' => ['bool', 'writer'=>'resource'], @@ -15694,36 +15694,36 @@ 'xmlwriter_end_dtd_entity' => ['bool', 'writer'=>'resource'], 'xmlwriter_end_element' => ['bool', 'writer'=>'resource'], 'xmlwriter_end_pi' => ['bool', 'writer'=>'resource'], -'xmlwriter_flush' => ['mixed', 'writer'=>'resource', 'empty='=>'bool'], +'xmlwriter_flush' => ['string|int|false', 'writer'=>'resource', 'empty='=>'bool'], 'xmlwriter_full_end_element' => ['bool', 'writer'=>'resource'], -'xmlwriter_open_memory' => ['resource'], -'xmlwriter_open_uri' => ['resource', 'uri'=>'string'], +'xmlwriter_open_memory' => ['resource|false'], +'xmlwriter_open_uri' => ['resource|false', 'uri'=>'string'], 'xmlwriter_output_memory' => ['string', 'writer'=>'resource', 'flush='=>'bool'], 'xmlwriter_set_indent' => ['bool', 'writer'=>'resource', 'enable'=>'bool'], 'xmlwriter_set_indent_string' => ['bool', 'writer'=>'resource', 'indentation'=>'string'], 'xmlwriter_start_attribute' => ['bool', 'writer'=>'resource', 'name'=>'string'], -'xmlwriter_start_attribute_ns' => ['bool', 'writer'=>'resource', 'prefix'=>'string', 'name'=>'string', 'namespace'=>'string'], +'xmlwriter_start_attribute_ns' => ['bool', 'writer'=>'resource', 'prefix'=>'string', 'name'=>'string', 'namespace'=>'?string'], 'xmlwriter_start_cdata' => ['bool', 'writer'=>'resource'], 'xmlwriter_start_comment' => ['bool', 'writer'=>'resource'], -'xmlwriter_start_document' => ['bool', 'writer'=>'resource', 'version='=>'string', 'encoding='=>'string', 'standalone='=>'string'], -'xmlwriter_start_dtd' => ['bool', 'writer'=>'resource', 'qualifiedName'=>'string', 'publicId='=>'string', 'systemId='=>'string'], +'xmlwriter_start_document' => ['bool', 'writer'=>'resource', 'version='=>'?string', 'encoding='=>'?string', 'standalone='=>'?string'], +'xmlwriter_start_dtd' => ['bool', 'writer'=>'resource', 'qualifiedName'=>'?string', 'publicId='=>'string', 'systemId='=>'?string'], 'xmlwriter_start_dtd_attlist' => ['bool', 'writer'=>'resource', 'name'=>'string'], 'xmlwriter_start_dtd_element' => ['bool', 'writer'=>'resource', 'qualifiedName'=>'string'], 'xmlwriter_start_dtd_entity' => ['bool', 'writer'=>'resource', 'name'=>'string', 'isParam'=>'bool'], 'xmlwriter_start_element' => ['bool', 'writer'=>'resource', 'name'=>'string'], -'xmlwriter_start_element_ns' => ['bool', 'writer'=>'resource', 'prefix'=>'string', 'name'=>'string', 'namespace'=>'string'], +'xmlwriter_start_element_ns' => ['bool', 'writer'=>'resource', 'prefix'=>'?string', 'name'=>'string', 'namespace'=>'?string'], 'xmlwriter_start_pi' => ['bool', 'writer'=>'resource', 'target'=>'string'], 'xmlwriter_text' => ['bool', 'writer'=>'resource', 'content'=>'string'], 'xmlwriter_write_attribute' => ['bool', 'writer'=>'resource', 'name'=>'string', 'value'=>'string'], -'xmlwriter_write_attribute_ns' => ['bool', 'writer'=>'resource', 'prefix'=>'string', 'name'=>'string', 'namespace'=>'string', 'value'=>'string'], +'xmlwriter_write_attribute_ns' => ['bool', 'writer'=>'resource', 'prefix'=>'string', 'name'=>'string', 'namespace'=>'string', 'value'=>'?string'], 'xmlwriter_write_cdata' => ['bool', 'writer'=>'resource', 'content'=>'string'], 'xmlwriter_write_comment' => ['bool', 'writer'=>'resource', 'content'=>'string'], -'xmlwriter_write_dtd' => ['bool', 'writer'=>'resource', 'name'=>'string', 'publicId='=>'string', 'systemId='=>'string', 'content='=>'string'], +'xmlwriter_write_dtd' => ['bool', 'writer'=>'resource', 'name'=>'string', 'publicId='=>'?string', 'systemId='=>'?string', 'content='=>'?string'], 'xmlwriter_write_dtd_attlist' => ['bool', 'writer'=>'resource', 'name'=>'string', 'content'=>'string'], 'xmlwriter_write_dtd_element' => ['bool', 'writer'=>'resource', 'name'=>'string', 'content'=>'string'], 'xmlwriter_write_dtd_entity' => ['bool', 'writer'=>'resource', 'name'=>'string', 'content'=>'string', 'isParam'=>'bool', 'publicId'=>'string', 'systemId'=>'string', 'notationData'=>'string'], -'xmlwriter_write_element' => ['bool', 'writer'=>'resource', 'name'=>'string', 'content'=>'string'], -'xmlwriter_write_element_ns' => ['bool', 'writer'=>'resource', 'prefix'=>'string', 'name'=>'string', 'namespace'=>'string', 'content'=>'string'], +'xmlwriter_write_element' => ['bool', 'writer'=>'resource', 'name'=>'string', 'content'=>'?string'], +'xmlwriter_write_element_ns' => ['bool', 'writer'=>'resource', 'prefix'=>'?string', 'name'=>'string', 'namespace'=>'string', 'content'=>'?string'], 'xmlwriter_write_pi' => ['bool', 'writer'=>'resource', 'target'=>'string', 'content'=>'string'], 'xmlwriter_write_raw' => ['bool', 'writer'=>'resource', 'content'=>'string'], 'xpath_new_context' => ['XPathContext', 'dom_document'=>'DOMDocument'], diff --git a/dictionaries/CallMap_80_delta.php b/dictionaries/CallMap_80_delta.php index cf6b707534d..0c2c53fcb08 100644 --- a/dictionaries/CallMap_80_delta.php +++ b/dictionaries/CallMap_80_delta.php @@ -263,48 +263,52 @@ 'xml_parser_free' => ['bool', 'parser'=>'XMLParser'], 'xml_parser_get_option' => ['mixed|false', 'parser'=>'XMLParser', 'option'=>'int'], 'xml_parser_set_option' => ['bool', 'parser'=>'XMLParser', 'option'=>'int', 'value'=>'mixed'], -'xmlwriter_end_attribute' => ['bool', 'xmlwriter'=>'XMLWriter'], -'xmlwriter_end_cdata' => ['bool', 'xmlwriter'=>'XMLWriter'], -'xmlwriter_end_comment' => ['bool', 'xmlwriter'=>'XMLWriter'], -'xmlwriter_end_document' => ['bool', 'xmlwriter'=>'XMLWriter'], -'xmlwriter_end_dtd' => ['bool', 'xmlwriter'=>'XMLWriter'], -'xmlwriter_end_dtd_attlist' => ['bool', 'xmlwriter'=>'XMLWriter'], -'xmlwriter_end_dtd_element' => ['bool', 'xmlwriter'=>'XMLWriter'], -'xmlwriter_end_dtd_entity' => ['bool', 'xmlwriter'=>'XMLWriter'], -'xmlwriter_end_element' => ['bool', 'xmlwriter'=>'XMLWriter'], -'xmlwriter_end_pi' => ['bool', 'xmlwriter'=>'XMLWriter'], -'xmlwriter_flush' => ['mixed', 'xmlwriter'=>'XMLWriter', 'empty='=>'bool'], -'xmlwriter_full_end_element' => ['bool', 'xmlwriter'=>'XMLWriter'], -'xmlwriter_open_memory' => ['XMLWriter'], -'xmlwriter_open_uri' => ['XMLWriter', 'source'=>'string'], -'xmlwriter_output_memory' => ['string', 'xmlwriter'=>'XMLWriter', 'flush='=>'bool'], -'xmlwriter_set_indent' => ['bool', 'xmlwriter'=>'XMLWriter', 'indent'=>'bool'], -'xmlwriter_set_indent_string' => ['bool', 'xmlwriter'=>'XMLWriter', 'indentstring'=>'string'], -'xmlwriter_start_attribute' => ['bool', 'xmlwriter'=>'XMLWriter', 'name'=>'string'], -'xmlwriter_start_attribute_ns' => ['bool', 'xmlwriter'=>'XMLWriter', 'prefix'=>'string', 'name'=>'string', 'uri'=>'string'], -'xmlwriter_start_cdata' => ['bool', 'xmlwriter'=>'XMLWriter'], -'xmlwriter_start_comment' => ['bool', 'xmlwriter'=>'XMLWriter'], -'xmlwriter_start_document' => ['bool', 'xmlwriter'=>'XMLWriter', 'version='=>'string', 'encoding='=>'string', 'standalone='=>'string'], -'xmlwriter_start_dtd' => ['bool', 'xmlwriter'=>'XMLWriter', 'name'=>'string', 'publicid='=>'string', 'sysid='=>'string'], -'xmlwriter_start_dtd_attlist' => ['bool', 'xmlwriter'=>'XMLWriter', 'name'=>'string'], -'xmlwriter_start_dtd_element' => ['bool', 'xmlwriter'=>'XMLWriter', 'name'=>'string'], -'xmlwriter_start_dtd_entity' => ['bool', 'xmlwriter'=>'XMLWriter', 'name'=>'string', 'isparam'=>'bool'], -'xmlwriter_start_element' => ['bool', 'xmlwriter'=>'XMLWriter', 'name'=>'string'], -'xmlwriter_start_element_ns' => ['bool', 'xmlwriter'=>'XMLWriter', 'prefix'=>'string', 'name'=>'string', 'uri'=>'string'], -'xmlwriter_start_pi' => ['bool', 'xmlwriter'=>'XMLWriter', 'target'=>'string'], -'xmlwriter_text' => ['bool', 'xmlwriter'=>'XMLWriter', 'content'=>'string'], -'xmlwriter_write_attribute' => ['bool', 'xmlwriter'=>'XMLWriter', 'name'=>'string', 'content'=>'string'], -'xmlwriter_write_attribute_ns' => ['bool', 'xmlwriter'=>'XMLWriter', 'prefix'=>'string', 'name'=>'string', 'uri'=>'string', 'content'=>'string'], -'xmlwriter_write_cdata' => ['bool', 'xmlwriter'=>'XMLWriter', 'content'=>'string'], -'xmlwriter_write_comment' => ['bool', 'xmlwriter'=>'XMLWriter', 'content'=>'string'], -'xmlwriter_write_dtd' => ['bool', 'xmlwriter'=>'XMLWriter', 'name'=>'string', 'publicid='=>'string', 'sysid='=>'string', 'subset='=>'string'], -'xmlwriter_write_dtd_attlist' => ['bool', 'xmlwriter'=>'XMLWriter', 'name'=>'string', 'content'=>'string'], -'xmlwriter_write_dtd_element' => ['bool', 'xmlwriter'=>'XMLWriter', 'name'=>'string', 'content'=>'string'], -'xmlwriter_write_dtd_entity' => ['bool', 'xmlwriter'=>'XMLWriter', 'name'=>'string', 'content'=>'string', 'pe'=>'bool', 'publicid'=>'string', 'sysid'=>'string', 'ndataid'=>'string'], -'xmlwriter_write_element' => ['bool', 'xmlwriter'=>'XMLWriter', 'name'=>'string', 'content'=>'string'], -'xmlwriter_write_element_ns' => ['bool', 'xmlwriter'=>'XMLWriter', 'prefix'=>'string', 'name'=>'string', 'uri'=>'string', 'content'=>'string'], -'xmlwriter_write_pi' => ['bool', 'xmlwriter'=>'XMLWriter', 'target'=>'string', 'content'=>'string'], -'xmlwriter_write_raw' => ['bool', 'xmlwriter'=>'XMLWriter', 'content'=>'string'], +'XMLWriter::flush' => ['string|int', 'empty='=>'bool'], +'XMLWriter::startAttributeNs' => ['bool', 'prefix'=>'?string', 'name'=>'string', 'namespace'=>'?string'], +'XMLWriter::writeAttributeNs' => ['bool', 'prefix'=>'?string', 'name'=>'string', 'namespace'=>'?string', 'value'=>'string'], +'XMLWriter::writeDtdEntity' => ['bool', 'name'=>'string', 'content'=>'string', 'isParam'=>'bool', 'publicId'=>'?string', 'systemId'=>'?string', 'notationData'=>'?string'], +'xmlwriter_end_attribute' => ['bool', 'writer'=>'XMLWriter'], +'xmlwriter_end_cdata' => ['bool', 'writer'=>'XMLWriter'], +'xmlwriter_end_comment' => ['bool', 'writer'=>'XMLWriter'], +'xmlwriter_end_document' => ['bool', 'writer'=>'XMLWriter'], +'xmlwriter_end_dtd' => ['bool', 'writer'=>'XMLWriter'], +'xmlwriter_end_dtd_attlist' => ['bool', 'writer'=>'XMLWriter'], +'xmlwriter_end_dtd_element' => ['bool', 'writer'=>'XMLWriter'], +'xmlwriter_end_dtd_entity' => ['bool', 'writer'=>'XMLWriter'], +'xmlwriter_end_element' => ['bool', 'writer'=>'XMLWriter'], +'xmlwriter_end_pi' => ['bool', 'writer'=>'XMLWriter'], +'xmlwriter_flush' => ['string|int', 'writer'=>'XMLWriter', 'empty='=>'bool'], +'xmlwriter_full_end_element' => ['bool', 'writer'=>'XMLWriter'], +'xmlwriter_open_memory' => ['XMLWriter|false'], +'xmlwriter_open_uri' => ['XMLWriter|false', 'uri'=>'string'], +'xmlwriter_output_memory' => ['string', 'writer'=>'XMLWriter', 'flush='=>'bool'], +'xmlwriter_set_indent' => ['bool', 'writer'=>'XMLWriter', 'enable'=>'bool'], +'xmlwriter_set_indent_string' => ['bool', 'writer'=>'XMLWriter', 'indentation'=>'string'], +'xmlwriter_start_attribute' => ['bool', 'writer'=>'XMLWriter', 'name'=>'string'], +'xmlwriter_start_attribute_ns' => ['bool', 'writer'=>'XMLWriter', 'prefix'=>'?string', 'name'=>'string', 'namespace'=>'?string'], +'xmlwriter_start_cdata' => ['bool', 'writer'=>'XMLWriter'], +'xmlwriter_start_comment' => ['bool', 'writer'=>'XMLWriter'], +'xmlwriter_start_document' => ['bool', 'writer'=>'XMLWriter', 'version='=>'?string', 'encoding='=>'?string', 'standalone='=>'?string'], +'xmlwriter_start_dtd' => ['bool', 'writer'=>'XMLWriter', 'qualifiedName'=>'?string', 'publicId='=>'string', 'systemId='=>'?string'], +'xmlwriter_start_dtd_attlist' => ['bool', 'writer'=>'XMLWriter', 'name'=>'string'], +'xmlwriter_start_dtd_element' => ['bool', 'writer'=>'XMLWriter', 'qualifiedName'=>'string'], +'xmlwriter_start_dtd_entity' => ['bool', 'writer'=>'XMLWriter', 'name'=>'string', 'isParam'=>'bool'], +'xmlwriter_start_element' => ['bool', 'writer'=>'XMLWriter', 'name'=>'string'], +'xmlwriter_start_element_ns' => ['bool', 'writer'=>'XMLWriter', 'prefix'=>'?string', 'name'=>'string', 'namespace'=>'?string'], +'xmlwriter_start_pi' => ['bool', 'writer'=>'XMLWriter', 'target'=>'string'], +'xmlwriter_text' => ['bool', 'writer'=>'XMLWriter', 'content'=>'string'], +'xmlwriter_write_attribute' => ['bool', 'writer'=>'XMLWriter', 'name'=>'string', 'value'=>'string'], +'xmlwriter_write_attribute_ns' => ['bool', 'writer'=>'XMLWriter', 'prefix'=>'?string', 'name'=>'string', 'namespace'=>'string', 'value'=>'?string'], +'xmlwriter_write_cdata' => ['bool', 'writer'=>'XMLWriter', 'content'=>'string'], +'xmlwriter_write_comment' => ['bool', 'writer'=>'XMLWriter', 'content'=>'string'], +'xmlwriter_write_dtd' => ['bool', 'writer'=>'XMLWriter', 'name'=>'string', 'publicId='=>'?string', 'systemId='=>'?string', 'content='=>'?string'], +'xmlwriter_write_dtd_attlist' => ['bool', 'writer'=>'XMLWriter', 'name'=>'string', 'content'=>'string'], +'xmlwriter_write_dtd_element' => ['bool', 'writer'=>'XMLWriter', 'name'=>'string', 'content'=>'string'], +'xmlwriter_write_dtd_entity' => ['bool', 'writer'=>'XMLWriter', 'name'=>'string', 'content'=>'string', 'isParam'=>'bool', 'publicId'=>'?string', 'systemId'=>'?string', 'notationData'=>'?string'], +'xmlwriter_write_element' => ['bool', 'writer'=>'XMLWriter', 'name'=>'string', 'content'=>'?string'], +'xmlwriter_write_element_ns' => ['bool', 'writer'=>'XMLWriter', 'prefix'=>'?string', 'name'=>'string', 'namespace'=>'string', 'content'=>'?string'], +'xmlwriter_write_pi' => ['bool', 'writer'=>'XMLWriter', 'target'=>'string', 'content'=>'string'], +'xmlwriter_write_raw' => ['bool', 'writer'=>'XMLWriter', 'content'=>'string'], ], 'old' => [ @@ -555,47 +559,51 @@ 'xml_parser_free' => ['bool', 'parser'=>'resource'], 'xml_parser_get_option' => ['mixed|false', 'parser'=>'resource', 'option'=>'int'], 'xml_parser_set_option' => ['bool', 'parser'=>'resource', 'option'=>'int', 'value'=>'mixed'], -'xmlwriter_end_attribute' => ['bool', 'xmlwriter'=>'resource'], -'xmlwriter_end_cdata' => ['bool', 'xmlwriter'=>'resource'], -'xmlwriter_end_comment' => ['bool', 'xmlwriter'=>'resource'], -'xmlwriter_end_document' => ['bool', 'xmlwriter'=>'resource'], -'xmlwriter_end_dtd' => ['bool', 'xmlwriter'=>'resource'], -'xmlwriter_end_dtd_attlist' => ['bool', 'xmlwriter'=>'resource'], -'xmlwriter_end_dtd_element' => ['bool', 'xmlwriter'=>'resource'], -'xmlwriter_end_dtd_entity' => ['bool', 'xmlwriter'=>'resource'], -'xmlwriter_end_element' => ['bool', 'xmlwriter'=>'resource'], -'xmlwriter_end_pi' => ['bool', 'xmlwriter'=>'resource'], -'xmlwriter_flush' => ['mixed', 'xmlwriter'=>'resource', 'empty='=>'bool'], -'xmlwriter_full_end_element' => ['bool', 'xmlwriter'=>'resource'], -'xmlwriter_open_memory' => ['resource'], -'xmlwriter_open_uri' => ['resource', 'source'=>'string'], -'xmlwriter_output_memory' => ['string', 'xmlwriter'=>'resource', 'flush='=>'bool'], -'xmlwriter_set_indent' => ['bool', 'xmlwriter'=>'resource', 'indent'=>'bool'], -'xmlwriter_set_indent_string' => ['bool', 'xmlwriter'=>'resource', 'indentstring'=>'string'], -'xmlwriter_start_attribute' => ['bool', 'xmlwriter'=>'resource', 'name'=>'string'], -'xmlwriter_start_attribute_ns' => ['bool', 'xmlwriter'=>'resource', 'prefix'=>'string', 'name'=>'string', 'uri'=>'string'], -'xmlwriter_start_cdata' => ['bool', 'xmlwriter'=>'resource'], -'xmlwriter_start_comment' => ['bool', 'xmlwriter'=>'resource'], -'xmlwriter_start_document' => ['bool', 'xmlwriter'=>'resource', 'version='=>'string', 'encoding='=>'string', 'standalone='=>'string'], -'xmlwriter_start_dtd' => ['bool', 'xmlwriter'=>'resource', 'name'=>'string', 'publicid='=>'string', 'sysid='=>'string'], -'xmlwriter_start_dtd_attlist' => ['bool', 'xmlwriter'=>'resource', 'name'=>'string'], -'xmlwriter_start_dtd_element' => ['bool', 'xmlwriter'=>'resource', 'name'=>'string'], -'xmlwriter_start_dtd_entity' => ['bool', 'xmlwriter'=>'resource', 'name'=>'string', 'isparam'=>'bool'], -'xmlwriter_start_element' => ['bool', 'xmlwriter'=>'resource', 'name'=>'string'], -'xmlwriter_start_element_ns' => ['bool', 'xmlwriter'=>'resource', 'prefix'=>'string', 'name'=>'string', 'uri'=>'string'], -'xmlwriter_start_pi' => ['bool', 'xmlwriter'=>'resource', 'target'=>'string'], -'xmlwriter_text' => ['bool', 'xmlwriter'=>'resource', 'content'=>'string'], -'xmlwriter_write_attribute' => ['bool', 'xmlwriter'=>'resource', 'name'=>'string', 'content'=>'string'], -'xmlwriter_write_attribute_ns' => ['bool', 'xmlwriter'=>'resource', 'prefix'=>'string', 'name'=>'string', 'uri'=>'string', 'content'=>'string'], -'xmlwriter_write_cdata' => ['bool', 'xmlwriter'=>'resource', 'content'=>'string'], -'xmlwriter_write_comment' => ['bool', 'xmlwriter'=>'resource', 'content'=>'string'], -'xmlwriter_write_dtd' => ['bool', 'xmlwriter'=>'resource', 'name'=>'string', 'publicid='=>'string', 'sysid='=>'string', 'subset='=>'string'], -'xmlwriter_write_dtd_attlist' => ['bool', 'xmlwriter'=>'resource', 'name'=>'string', 'content'=>'string'], -'xmlwriter_write_dtd_element' => ['bool', 'xmlwriter'=>'resource', 'name'=>'string', 'content'=>'string'], -'xmlwriter_write_dtd_entity' => ['bool', 'xmlwriter'=>'resource', 'name'=>'string', 'content'=>'string', 'pe'=>'bool', 'publicid'=>'string', 'sysid'=>'string', 'ndataid'=>'string'], -'xmlwriter_write_element' => ['bool', 'xmlwriter'=>'resource', 'name'=>'string', 'content'=>'string'], -'xmlwriter_write_element_ns' => ['bool', 'xmlwriter'=>'resource', 'prefix'=>'string', 'name'=>'string', 'uri'=>'string', 'content'=>'string'], -'xmlwriter_write_pi' => ['bool', 'xmlwriter'=>'resource', 'target'=>'string', 'content'=>'string'], -'xmlwriter_write_raw' => ['bool', 'xmlwriter'=>'resource', 'content'=>'string'], +'XMLWriter::flush' => ['string|int|false', 'empty='=>'bool'], +'XMLWriter::startAttributeNs' => ['bool', 'prefix'=>'string', 'name'=>'string', 'namespace'=>'?string'], +'XMLWriter::writeAttributeNs' => ['bool', 'prefix'=>'string', 'name'=>'string', 'namespace'=>'?string', 'value'=>'string'], +'XMLWriter::writeDtdEntity' => ['bool', 'name'=>'string', 'content'=>'string', 'isParam'=>'bool', 'publicId'=>'string', 'systemId'=>'string', 'notationData'=>'string'], +'xmlwriter_end_attribute' => ['bool', 'writer'=>'resource'], +'xmlwriter_end_cdata' => ['bool', 'writer'=>'resource'], +'xmlwriter_end_comment' => ['bool', 'writer'=>'resource'], +'xmlwriter_end_document' => ['bool', 'writer'=>'resource'], +'xmlwriter_end_dtd' => ['bool', 'writer'=>'resource'], +'xmlwriter_end_dtd_attlist' => ['bool', 'writer'=>'resource'], +'xmlwriter_end_dtd_element' => ['bool', 'writer'=>'resource'], +'xmlwriter_end_dtd_entity' => ['bool', 'writer'=>'resource'], +'xmlwriter_end_element' => ['bool', 'writer'=>'resource'], +'xmlwriter_end_pi' => ['bool', 'writer'=>'resource'], +'xmlwriter_flush' => ['string|int|false', 'writer'=>'resource', 'empty='=>'bool'], +'xmlwriter_full_end_element' => ['bool', 'writer'=>'resource'], +'xmlwriter_open_memory' => ['resource|false'], +'xmlwriter_open_uri' => ['resource|false', 'uri'=>'string'], +'xmlwriter_output_memory' => ['string', 'writer'=>'resource', 'flush='=>'bool'], +'xmlwriter_set_indent' => ['bool', 'writer'=>'resource', 'enable'=>'bool'], +'xmlwriter_set_indent_string' => ['bool', 'writer'=>'resource', 'indentation'=>'string'], +'xmlwriter_start_attribute' => ['bool', 'writer'=>'resource', 'name'=>'string'], +'xmlwriter_start_attribute_ns' => ['bool', 'writer'=>'resource', 'prefix'=>'string', 'name'=>'string', 'namespace'=>'?string'], +'xmlwriter_start_cdata' => ['bool', 'writer'=>'resource'], +'xmlwriter_start_comment' => ['bool', 'writer'=>'resource'], +'xmlwriter_start_document' => ['bool', 'writer'=>'resource', 'version='=>'?string', 'encoding='=>'?string', 'standalone='=>'?string'], +'xmlwriter_start_dtd' => ['bool', 'writer'=>'resource', 'qualifiedName'=>'?string', 'publicId='=>'string', 'systemId='=>'?string'], +'xmlwriter_start_dtd_attlist' => ['bool', 'writer'=>'resource', 'name'=>'string'], +'xmlwriter_start_dtd_element' => ['bool', 'writer'=>'resource', 'qualifiedName'=>'string'], +'xmlwriter_start_dtd_entity' => ['bool', 'writer'=>'resource', 'name'=>'string', 'isParam'=>'bool'], +'xmlwriter_start_element' => ['bool', 'writer'=>'resource', 'name'=>'string'], +'xmlwriter_start_element_ns' => ['bool', 'writer'=>'resource', 'prefix'=>'?string', 'name'=>'string', 'namespace'=>'?string'], +'xmlwriter_start_pi' => ['bool', 'writer'=>'resource', 'target'=>'string'], +'xmlwriter_text' => ['bool', 'writer'=>'resource', 'content'=>'string'], +'xmlwriter_write_attribute' => ['bool', 'writer'=>'resource', 'name'=>'string', 'value'=>'string'], +'xmlwriter_write_attribute_ns' => ['bool', 'writer'=>'resource', 'prefix'=>'string', 'name'=>'string', 'namespace'=>'string', 'value'=>'?string'], +'xmlwriter_write_cdata' => ['bool', 'writer'=>'resource', 'content'=>'string'], +'xmlwriter_write_comment' => ['bool', 'writer'=>'resource', 'content'=>'string'], +'xmlwriter_write_dtd' => ['bool', 'writer'=>'resource', 'name'=>'string', 'publicId='=>'?string', 'systemId='=>'?string', 'content='=>'?string'], +'xmlwriter_write_dtd_attlist' => ['bool', 'writer'=>'resource', 'name'=>'string', 'content'=>'string'], +'xmlwriter_write_dtd_element' => ['bool', 'writer'=>'resource', 'name'=>'string', 'content'=>'string'], +'xmlwriter_write_dtd_entity' => ['bool', 'writer'=>'resource', 'name'=>'string', 'content'=>'string', 'isParam'=>'bool', 'publicId'=>'string', 'systemId'=>'string', 'notationData'=>'string'], +'xmlwriter_write_element' => ['bool', 'writer'=>'resource', 'name'=>'string', 'content'=>'?string'], +'xmlwriter_write_element_ns' => ['bool', 'writer'=>'resource', 'prefix'=>'?string', 'name'=>'string', 'namespace'=>'string', 'content'=>'?string'], +'xmlwriter_write_pi' => ['bool', 'writer'=>'resource', 'target'=>'string', 'content'=>'string'], +'xmlwriter_write_raw' => ['bool', 'writer'=>'resource', 'content'=>'string'], ] ]; From f304408662a7930468a0aad2c44caffc506f29cb Mon Sep 17 00:00:00 2001 From: Arnout Boks Date: Thu, 15 Jul 2021 15:01:55 +0200 Subject: [PATCH 2/5] Fix incorrect signature for xmlwriter_start_dtd --- dictionaries/CallMap.php | 2 +- dictionaries/CallMap_80_delta.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php index 0365d3041ce..c5fa88806f2 100644 --- a/dictionaries/CallMap.php +++ b/dictionaries/CallMap.php @@ -15706,7 +15706,7 @@ 'xmlwriter_start_cdata' => ['bool', 'writer'=>'resource'], 'xmlwriter_start_comment' => ['bool', 'writer'=>'resource'], 'xmlwriter_start_document' => ['bool', 'writer'=>'resource', 'version='=>'?string', 'encoding='=>'?string', 'standalone='=>'?string'], -'xmlwriter_start_dtd' => ['bool', 'writer'=>'resource', 'qualifiedName'=>'?string', 'publicId='=>'string', 'systemId='=>'?string'], +'xmlwriter_start_dtd' => ['bool', 'writer'=>'resource', 'qualifiedName'=>'string', 'publicId='=>'?string', 'systemId='=>'?string'], 'xmlwriter_start_dtd_attlist' => ['bool', 'writer'=>'resource', 'name'=>'string'], 'xmlwriter_start_dtd_element' => ['bool', 'writer'=>'resource', 'qualifiedName'=>'string'], 'xmlwriter_start_dtd_entity' => ['bool', 'writer'=>'resource', 'name'=>'string', 'isParam'=>'bool'], diff --git a/dictionaries/CallMap_80_delta.php b/dictionaries/CallMap_80_delta.php index 0c2c53fcb08..7f681f3f32b 100644 --- a/dictionaries/CallMap_80_delta.php +++ b/dictionaries/CallMap_80_delta.php @@ -289,7 +289,7 @@ 'xmlwriter_start_cdata' => ['bool', 'writer'=>'XMLWriter'], 'xmlwriter_start_comment' => ['bool', 'writer'=>'XMLWriter'], 'xmlwriter_start_document' => ['bool', 'writer'=>'XMLWriter', 'version='=>'?string', 'encoding='=>'?string', 'standalone='=>'?string'], -'xmlwriter_start_dtd' => ['bool', 'writer'=>'XMLWriter', 'qualifiedName'=>'?string', 'publicId='=>'string', 'systemId='=>'?string'], +'xmlwriter_start_dtd' => ['bool', 'writer'=>'XMLWriter', 'qualifiedName'=>'string', 'publicId='=>'?string', 'systemId='=>'?string'], 'xmlwriter_start_dtd_attlist' => ['bool', 'writer'=>'XMLWriter', 'name'=>'string'], 'xmlwriter_start_dtd_element' => ['bool', 'writer'=>'XMLWriter', 'qualifiedName'=>'string'], 'xmlwriter_start_dtd_entity' => ['bool', 'writer'=>'XMLWriter', 'name'=>'string', 'isParam'=>'bool'], @@ -585,7 +585,7 @@ 'xmlwriter_start_cdata' => ['bool', 'writer'=>'resource'], 'xmlwriter_start_comment' => ['bool', 'writer'=>'resource'], 'xmlwriter_start_document' => ['bool', 'writer'=>'resource', 'version='=>'?string', 'encoding='=>'?string', 'standalone='=>'?string'], -'xmlwriter_start_dtd' => ['bool', 'writer'=>'resource', 'qualifiedName'=>'?string', 'publicId='=>'string', 'systemId='=>'?string'], +'xmlwriter_start_dtd' => ['bool', 'writer'=>'resource', 'qualifiedName'=>'string', 'publicId='=>'?string', 'systemId='=>'?string'], 'xmlwriter_start_dtd_attlist' => ['bool', 'writer'=>'resource', 'name'=>'string'], 'xmlwriter_start_dtd_element' => ['bool', 'writer'=>'resource', 'qualifiedName'=>'string'], 'xmlwriter_start_dtd_entity' => ['bool', 'writer'=>'resource', 'name'=>'string', 'isParam'=>'bool'], From f90e3663989721b3394df8a104d4a1d255fa96e7 Mon Sep 17 00:00:00 2001 From: Arnout Boks Date: Fri, 16 Jul 2021 07:22:41 +0200 Subject: [PATCH 3/5] Fix incorrect signature for XMLWriter::writeAttributeNs() https://github.com/vimeo/psalm/pull/6099#discussion_r670604872 --- dictionaries/CallMap.php | 4 ++-- dictionaries/CallMap_80_delta.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php index c5fa88806f2..30aaf2af585 100644 --- a/dictionaries/CallMap.php +++ b/dictionaries/CallMap.php @@ -15673,7 +15673,7 @@ 'XMLWriter::startPi' => ['bool', 'target'=>'string'], 'XMLWriter::text' => ['bool', 'content'=>'string'], 'XMLWriter::writeAttribute' => ['bool', 'name'=>'string', 'value'=>'string'], -'XMLWriter::writeAttributeNs' => ['bool', 'prefix'=>'string', 'name'=>'string', 'namespace'=>'string', 'value'=>'string'], +'XMLWriter::writeAttributeNs' => ['bool', 'prefix'=>'string', 'name'=>'string', 'namespace'=>'?string', 'value'=>'string'], 'XMLWriter::writeCdata' => ['bool', 'content'=>'string'], 'XMLWriter::writeComment' => ['bool', 'content'=>'string'], 'XMLWriter::writeDtd' => ['bool', 'name'=>'string', 'publicId='=>'?string', 'systemId='=>'?string', 'content='=>'?string'], @@ -15715,7 +15715,7 @@ 'xmlwriter_start_pi' => ['bool', 'writer'=>'resource', 'target'=>'string'], 'xmlwriter_text' => ['bool', 'writer'=>'resource', 'content'=>'string'], 'xmlwriter_write_attribute' => ['bool', 'writer'=>'resource', 'name'=>'string', 'value'=>'string'], -'xmlwriter_write_attribute_ns' => ['bool', 'writer'=>'resource', 'prefix'=>'string', 'name'=>'string', 'namespace'=>'string', 'value'=>'?string'], +'xmlwriter_write_attribute_ns' => ['bool', 'writer'=>'resource', 'prefix'=>'string', 'name'=>'string', 'namespace'=>'?string', 'value'=>'string'], 'xmlwriter_write_cdata' => ['bool', 'writer'=>'resource', 'content'=>'string'], 'xmlwriter_write_comment' => ['bool', 'writer'=>'resource', 'content'=>'string'], 'xmlwriter_write_dtd' => ['bool', 'writer'=>'resource', 'name'=>'string', 'publicId='=>'?string', 'systemId='=>'?string', 'content='=>'?string'], diff --git a/dictionaries/CallMap_80_delta.php b/dictionaries/CallMap_80_delta.php index 7f681f3f32b..7e39e314e59 100644 --- a/dictionaries/CallMap_80_delta.php +++ b/dictionaries/CallMap_80_delta.php @@ -594,7 +594,7 @@ 'xmlwriter_start_pi' => ['bool', 'writer'=>'resource', 'target'=>'string'], 'xmlwriter_text' => ['bool', 'writer'=>'resource', 'content'=>'string'], 'xmlwriter_write_attribute' => ['bool', 'writer'=>'resource', 'name'=>'string', 'value'=>'string'], -'xmlwriter_write_attribute_ns' => ['bool', 'writer'=>'resource', 'prefix'=>'string', 'name'=>'string', 'namespace'=>'string', 'value'=>'?string'], +'xmlwriter_write_attribute_ns' => ['bool', 'writer'=>'resource', 'prefix'=>'string', 'name'=>'string', 'namespace'=>'?string', 'value'=>'string'], 'xmlwriter_write_cdata' => ['bool', 'writer'=>'resource', 'content'=>'string'], 'xmlwriter_write_comment' => ['bool', 'writer'=>'resource', 'content'=>'string'], 'xmlwriter_write_dtd' => ['bool', 'writer'=>'resource', 'name'=>'string', 'publicId='=>'?string', 'systemId='=>'?string', 'content='=>'?string'], From 08a80dd238e54d5ad68c701d514318508b720994 Mon Sep 17 00:00:00 2001 From: Arnout Boks Date: Sat, 17 Jul 2021 12:40:27 +0200 Subject: [PATCH 4/5] Fix main callmap should contain newest signatures https://github.com/vimeo/psalm/pull/6099#discussion_r671556027 --- dictionaries/CallMap.php | 92 ++++++++++++++++++++-------------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php index 30aaf2af585..f67e251b769 100644 --- a/dictionaries/CallMap.php +++ b/dictionaries/CallMap.php @@ -15652,7 +15652,7 @@ 'XMLWriter::endDtdEntity' => ['bool'], 'XMLWriter::endElement' => ['bool'], 'XMLWriter::endPi' => ['bool'], -'XMLWriter::flush' => ['string|int|false', 'empty='=>'bool'], +'XMLWriter::flush' => ['string|int', 'empty='=>'bool'], 'XMLWriter::fullEndElement' => ['bool'], 'XMLWriter::openMemory' => ['bool'], 'XMLWriter::openUri' => ['bool', 'uri'=>'string'], @@ -15660,7 +15660,7 @@ 'XMLWriter::setIndent' => ['bool', 'enable'=>'bool'], 'XMLWriter::setIndentString' => ['bool', 'indentation'=>'string'], 'XMLWriter::startAttribute' => ['bool', 'name'=>'string'], -'XMLWriter::startAttributeNs' => ['bool', 'prefix'=>'string', 'name'=>'string', 'namespace'=>'?string'], +'XMLWriter::startAttributeNs' => ['bool', 'prefix'=>'?string', 'name'=>'string', 'namespace'=>'?string'], 'XMLWriter::startCdata' => ['bool'], 'XMLWriter::startComment' => ['bool'], 'XMLWriter::startDocument' => ['bool', 'version='=>'?string', 'encoding='=>'?string', 'standalone='=>'?string'], @@ -15673,59 +15673,59 @@ 'XMLWriter::startPi' => ['bool', 'target'=>'string'], 'XMLWriter::text' => ['bool', 'content'=>'string'], 'XMLWriter::writeAttribute' => ['bool', 'name'=>'string', 'value'=>'string'], -'XMLWriter::writeAttributeNs' => ['bool', 'prefix'=>'string', 'name'=>'string', 'namespace'=>'?string', 'value'=>'string'], +'XMLWriter::writeAttributeNs' => ['bool', 'prefix'=>'?string', 'name'=>'string', 'namespace'=>'?string', 'value'=>'string'], 'XMLWriter::writeCdata' => ['bool', 'content'=>'string'], 'XMLWriter::writeComment' => ['bool', 'content'=>'string'], 'XMLWriter::writeDtd' => ['bool', 'name'=>'string', 'publicId='=>'?string', 'systemId='=>'?string', 'content='=>'?string'], 'XMLWriter::writeDtdAttlist' => ['bool', 'name'=>'string', 'content'=>'string'], 'XMLWriter::writeDtdElement' => ['bool', 'name'=>'string', 'content'=>'string'], -'XMLWriter::writeDtdEntity' => ['bool', 'name'=>'string', 'content'=>'string', 'isParam'=>'bool', 'publicId'=>'string', 'systemId'=>'string', 'notationData'=>'string'], +'XMLWriter::writeDtdEntity' => ['bool', 'name'=>'string', 'content'=>'string', 'isParam'=>'bool', 'publicId'=>'?string', 'systemId'=>'?string', 'notationData'=>'?string'], 'XMLWriter::writeElement' => ['bool', 'name'=>'string', 'content='=>'?string'], 'XMLWriter::writeElementNs' => ['bool', 'prefix'=>'?string', 'name'=>'string', 'namespace'=>'?string', 'content='=>'?string'], 'XMLWriter::writePi' => ['bool', 'target'=>'string', 'content'=>'string'], 'XMLWriter::writeRaw' => ['bool', 'content'=>'string'], -'xmlwriter_end_attribute' => ['bool', 'writer'=>'resource'], -'xmlwriter_end_cdata' => ['bool', 'writer'=>'resource'], -'xmlwriter_end_comment' => ['bool', 'writer'=>'resource'], -'xmlwriter_end_document' => ['bool', 'writer'=>'resource'], -'xmlwriter_end_dtd' => ['bool', 'writer'=>'resource'], -'xmlwriter_end_dtd_attlist' => ['bool', 'writer'=>'resource'], -'xmlwriter_end_dtd_element' => ['bool', 'writer'=>'resource'], -'xmlwriter_end_dtd_entity' => ['bool', 'writer'=>'resource'], -'xmlwriter_end_element' => ['bool', 'writer'=>'resource'], -'xmlwriter_end_pi' => ['bool', 'writer'=>'resource'], -'xmlwriter_flush' => ['string|int|false', 'writer'=>'resource', 'empty='=>'bool'], -'xmlwriter_full_end_element' => ['bool', 'writer'=>'resource'], -'xmlwriter_open_memory' => ['resource|false'], -'xmlwriter_open_uri' => ['resource|false', 'uri'=>'string'], -'xmlwriter_output_memory' => ['string', 'writer'=>'resource', 'flush='=>'bool'], -'xmlwriter_set_indent' => ['bool', 'writer'=>'resource', 'enable'=>'bool'], -'xmlwriter_set_indent_string' => ['bool', 'writer'=>'resource', 'indentation'=>'string'], -'xmlwriter_start_attribute' => ['bool', 'writer'=>'resource', 'name'=>'string'], -'xmlwriter_start_attribute_ns' => ['bool', 'writer'=>'resource', 'prefix'=>'string', 'name'=>'string', 'namespace'=>'?string'], -'xmlwriter_start_cdata' => ['bool', 'writer'=>'resource'], -'xmlwriter_start_comment' => ['bool', 'writer'=>'resource'], -'xmlwriter_start_document' => ['bool', 'writer'=>'resource', 'version='=>'?string', 'encoding='=>'?string', 'standalone='=>'?string'], -'xmlwriter_start_dtd' => ['bool', 'writer'=>'resource', 'qualifiedName'=>'string', 'publicId='=>'?string', 'systemId='=>'?string'], -'xmlwriter_start_dtd_attlist' => ['bool', 'writer'=>'resource', 'name'=>'string'], -'xmlwriter_start_dtd_element' => ['bool', 'writer'=>'resource', 'qualifiedName'=>'string'], -'xmlwriter_start_dtd_entity' => ['bool', 'writer'=>'resource', 'name'=>'string', 'isParam'=>'bool'], -'xmlwriter_start_element' => ['bool', 'writer'=>'resource', 'name'=>'string'], -'xmlwriter_start_element_ns' => ['bool', 'writer'=>'resource', 'prefix'=>'?string', 'name'=>'string', 'namespace'=>'?string'], -'xmlwriter_start_pi' => ['bool', 'writer'=>'resource', 'target'=>'string'], -'xmlwriter_text' => ['bool', 'writer'=>'resource', 'content'=>'string'], -'xmlwriter_write_attribute' => ['bool', 'writer'=>'resource', 'name'=>'string', 'value'=>'string'], -'xmlwriter_write_attribute_ns' => ['bool', 'writer'=>'resource', 'prefix'=>'string', 'name'=>'string', 'namespace'=>'?string', 'value'=>'string'], -'xmlwriter_write_cdata' => ['bool', 'writer'=>'resource', 'content'=>'string'], -'xmlwriter_write_comment' => ['bool', 'writer'=>'resource', 'content'=>'string'], -'xmlwriter_write_dtd' => ['bool', 'writer'=>'resource', 'name'=>'string', 'publicId='=>'?string', 'systemId='=>'?string', 'content='=>'?string'], -'xmlwriter_write_dtd_attlist' => ['bool', 'writer'=>'resource', 'name'=>'string', 'content'=>'string'], -'xmlwriter_write_dtd_element' => ['bool', 'writer'=>'resource', 'name'=>'string', 'content'=>'string'], -'xmlwriter_write_dtd_entity' => ['bool', 'writer'=>'resource', 'name'=>'string', 'content'=>'string', 'isParam'=>'bool', 'publicId'=>'string', 'systemId'=>'string', 'notationData'=>'string'], -'xmlwriter_write_element' => ['bool', 'writer'=>'resource', 'name'=>'string', 'content'=>'?string'], -'xmlwriter_write_element_ns' => ['bool', 'writer'=>'resource', 'prefix'=>'?string', 'name'=>'string', 'namespace'=>'string', 'content'=>'?string'], -'xmlwriter_write_pi' => ['bool', 'writer'=>'resource', 'target'=>'string', 'content'=>'string'], -'xmlwriter_write_raw' => ['bool', 'writer'=>'resource', 'content'=>'string'], +'xmlwriter_end_attribute' => ['bool', 'writer'=>'XMLWriter'], +'xmlwriter_end_cdata' => ['bool', 'writer'=>'XMLWriter'], +'xmlwriter_end_comment' => ['bool', 'writer'=>'XMLWriter'], +'xmlwriter_end_document' => ['bool', 'writer'=>'XMLWriter'], +'xmlwriter_end_dtd' => ['bool', 'writer'=>'XMLWriter'], +'xmlwriter_end_dtd_attlist' => ['bool', 'writer'=>'XMLWriter'], +'xmlwriter_end_dtd_element' => ['bool', 'writer'=>'XMLWriter'], +'xmlwriter_end_dtd_entity' => ['bool', 'writer'=>'XMLWriter'], +'xmlwriter_end_element' => ['bool', 'writer'=>'XMLWriter'], +'xmlwriter_end_pi' => ['bool', 'writer'=>'XMLWriter'], +'xmlwriter_flush' => ['string|int', 'writer'=>'XMLWriter', 'empty='=>'bool'], +'xmlwriter_full_end_element' => ['bool', 'writer'=>'XMLWriter'], +'xmlwriter_open_memory' => ['XMLWriter|false'], +'xmlwriter_open_uri' => ['XMLWriter|false', 'uri'=>'string'], +'xmlwriter_output_memory' => ['string', 'writer'=>'XMLWriter', 'flush='=>'bool'], +'xmlwriter_set_indent' => ['bool', 'writer'=>'XMLWriter', 'enable'=>'bool'], +'xmlwriter_set_indent_string' => ['bool', 'writer'=>'XMLWriter', 'indentation'=>'string'], +'xmlwriter_start_attribute' => ['bool', 'writer'=>'XMLWriter', 'name'=>'string'], +'xmlwriter_start_attribute_ns' => ['bool', 'writer'=>'XMLWriter', 'prefix'=>'?string', 'name'=>'string', 'namespace'=>'?string'], +'xmlwriter_start_cdata' => ['bool', 'writer'=>'XMLWriter'], +'xmlwriter_start_comment' => ['bool', 'writer'=>'XMLWriter'], +'xmlwriter_start_document' => ['bool', 'writer'=>'XMLWriter', 'version='=>'?string', 'encoding='=>'?string', 'standalone='=>'?string'], +'xmlwriter_start_dtd' => ['bool', 'writer'=>'XMLWriter', 'qualifiedName'=>'string', 'publicId='=>'?string', 'systemId='=>'?string'], +'xmlwriter_start_dtd_attlist' => ['bool', 'writer'=>'XMLWriter', 'name'=>'string'], +'xmlwriter_start_dtd_element' => ['bool', 'writer'=>'XMLWriter', 'qualifiedName'=>'string'], +'xmlwriter_start_dtd_entity' => ['bool', 'writer'=>'XMLWriter', 'name'=>'string', 'isParam'=>'bool'], +'xmlwriter_start_element' => ['bool', 'writer'=>'XMLWriter', 'name'=>'string'], +'xmlwriter_start_element_ns' => ['bool', 'writer'=>'XMLWriter', 'prefix'=>'?string', 'name'=>'string', 'namespace'=>'?string'], +'xmlwriter_start_pi' => ['bool', 'writer'=>'XMLWriter', 'target'=>'string'], +'xmlwriter_text' => ['bool', 'writer'=>'XMLWriter', 'content'=>'string'], +'xmlwriter_write_attribute' => ['bool', 'writer'=>'XMLWriter', 'name'=>'string', 'value'=>'string'], +'xmlwriter_write_attribute_ns' => ['bool', 'writer'=>'XMLWriter', 'prefix'=>'?string', 'name'=>'string', 'namespace'=>'string', 'value'=>'?string'], +'xmlwriter_write_cdata' => ['bool', 'writer'=>'XMLWriter', 'content'=>'string'], +'xmlwriter_write_comment' => ['bool', 'writer'=>'XMLWriter', 'content'=>'string'], +'xmlwriter_write_dtd' => ['bool', 'writer'=>'XMLWriter', 'name'=>'string', 'publicId='=>'?string', 'systemId='=>'?string', 'content='=>'?string'], +'xmlwriter_write_dtd_attlist' => ['bool', 'writer'=>'XMLWriter', 'name'=>'string', 'content'=>'string'], +'xmlwriter_write_dtd_element' => ['bool', 'writer'=>'XMLWriter', 'name'=>'string', 'content'=>'string'], +'xmlwriter_write_dtd_entity' => ['bool', 'writer'=>'XMLWriter', 'name'=>'string', 'content'=>'string', 'isParam'=>'bool', 'publicId'=>'?string', 'systemId'=>'?string', 'notationData'=>'?string'], +'xmlwriter_write_element' => ['bool', 'writer'=>'XMLWriter', 'name'=>'string', 'content'=>'?string'], +'xmlwriter_write_element_ns' => ['bool', 'writer'=>'XMLWriter', 'prefix'=>'?string', 'name'=>'string', 'namespace'=>'string', 'content'=>'?string'], +'xmlwriter_write_pi' => ['bool', 'writer'=>'XMLWriter', 'target'=>'string', 'content'=>'string'], +'xmlwriter_write_raw' => ['bool', 'writer'=>'XMLWriter', 'content'=>'string'], 'xpath_new_context' => ['XPathContext', 'dom_document'=>'DOMDocument'], 'xpath_register_ns' => ['bool', 'xpath_context'=>'xpathcontext', 'prefix'=>'string', 'uri'=>'string'], 'xpath_register_ns_auto' => ['bool', 'xpath_context'=>'xpathcontext', 'context_node='=>'object'], From a29cbd3c95dbd9b2638b1addd5ec06336bc06565 Mon Sep 17 00:00:00 2001 From: Bruce Weirdan Date: Sat, 17 Jul 2021 23:37:32 +0300 Subject: [PATCH 5/5] More callmap fixes * `writeDtdEntity()`/`xmlwriter_write_dtd_entity()` has optional params * `xmlwriter_write_attribute_ns` has `$namespace` param as nullable, not `$content` * `xmlwriter_write_element()`/`xmlwriter_write_element_ns()` has `$content` param as optional --- dictionaries/CallMap.php | 10 +++++----- dictionaries/CallMap_80_delta.php | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php index f67e251b769..c705dea36fb 100644 --- a/dictionaries/CallMap.php +++ b/dictionaries/CallMap.php @@ -15679,7 +15679,7 @@ 'XMLWriter::writeDtd' => ['bool', 'name'=>'string', 'publicId='=>'?string', 'systemId='=>'?string', 'content='=>'?string'], 'XMLWriter::writeDtdAttlist' => ['bool', 'name'=>'string', 'content'=>'string'], 'XMLWriter::writeDtdElement' => ['bool', 'name'=>'string', 'content'=>'string'], -'XMLWriter::writeDtdEntity' => ['bool', 'name'=>'string', 'content'=>'string', 'isParam'=>'bool', 'publicId'=>'?string', 'systemId'=>'?string', 'notationData'=>'?string'], +'XMLWriter::writeDtdEntity' => ['bool', 'name'=>'string', 'content'=>'string', 'isParam='=>'bool', 'publicId='=>'?string', 'systemId='=>'?string', 'notationData='=>'?string'], 'XMLWriter::writeElement' => ['bool', 'name'=>'string', 'content='=>'?string'], 'XMLWriter::writeElementNs' => ['bool', 'prefix'=>'?string', 'name'=>'string', 'namespace'=>'?string', 'content='=>'?string'], 'XMLWriter::writePi' => ['bool', 'target'=>'string', 'content'=>'string'], @@ -15715,15 +15715,15 @@ 'xmlwriter_start_pi' => ['bool', 'writer'=>'XMLWriter', 'target'=>'string'], 'xmlwriter_text' => ['bool', 'writer'=>'XMLWriter', 'content'=>'string'], 'xmlwriter_write_attribute' => ['bool', 'writer'=>'XMLWriter', 'name'=>'string', 'value'=>'string'], -'xmlwriter_write_attribute_ns' => ['bool', 'writer'=>'XMLWriter', 'prefix'=>'?string', 'name'=>'string', 'namespace'=>'string', 'value'=>'?string'], +'xmlwriter_write_attribute_ns' => ['bool', 'writer'=>'XMLWriter', 'prefix'=>'?string', 'name'=>'string', 'namespace'=>'?string', 'value'=>'string'], 'xmlwriter_write_cdata' => ['bool', 'writer'=>'XMLWriter', 'content'=>'string'], 'xmlwriter_write_comment' => ['bool', 'writer'=>'XMLWriter', 'content'=>'string'], 'xmlwriter_write_dtd' => ['bool', 'writer'=>'XMLWriter', 'name'=>'string', 'publicId='=>'?string', 'systemId='=>'?string', 'content='=>'?string'], 'xmlwriter_write_dtd_attlist' => ['bool', 'writer'=>'XMLWriter', 'name'=>'string', 'content'=>'string'], 'xmlwriter_write_dtd_element' => ['bool', 'writer'=>'XMLWriter', 'name'=>'string', 'content'=>'string'], -'xmlwriter_write_dtd_entity' => ['bool', 'writer'=>'XMLWriter', 'name'=>'string', 'content'=>'string', 'isParam'=>'bool', 'publicId'=>'?string', 'systemId'=>'?string', 'notationData'=>'?string'], -'xmlwriter_write_element' => ['bool', 'writer'=>'XMLWriter', 'name'=>'string', 'content'=>'?string'], -'xmlwriter_write_element_ns' => ['bool', 'writer'=>'XMLWriter', 'prefix'=>'?string', 'name'=>'string', 'namespace'=>'string', 'content'=>'?string'], +'xmlwriter_write_dtd_entity' => ['bool', 'writer'=>'XMLWriter', 'name'=>'string', 'content'=>'string', 'isParam='=>'bool', 'publicId='=>'?string', 'systemId='=>'?string', 'notationData='=>'?string'], +'xmlwriter_write_element' => ['bool', 'writer'=>'XMLWriter', 'name'=>'string', 'content='=>'?string'], +'xmlwriter_write_element_ns' => ['bool', 'writer'=>'XMLWriter', 'prefix'=>'?string', 'name'=>'string', 'namespace'=>'?string', 'content='=>'?string'], 'xmlwriter_write_pi' => ['bool', 'writer'=>'XMLWriter', 'target'=>'string', 'content'=>'string'], 'xmlwriter_write_raw' => ['bool', 'writer'=>'XMLWriter', 'content'=>'string'], 'xpath_new_context' => ['XPathContext', 'dom_document'=>'DOMDocument'], diff --git a/dictionaries/CallMap_80_delta.php b/dictionaries/CallMap_80_delta.php index 7e39e314e59..1c29034f704 100644 --- a/dictionaries/CallMap_80_delta.php +++ b/dictionaries/CallMap_80_delta.php @@ -5,7 +5,7 @@ * * This has two sections. * The 'new' section contains function/method names from FunctionSignatureMap (And alternates, if applicable) that do not exist in php7.4 or have different signatures in php 8.0. - * If they were just updated, the function/method will be present in the 'added' signatures. + * If they were just updated, the function/method will be present in the 'new' section with the new signature, and the 'old' section with the old signature * The 'old' signatures contains the signatures that are different in php 7.4. * Functions are expected to be removed only in major releases of php. * @@ -266,7 +266,7 @@ 'XMLWriter::flush' => ['string|int', 'empty='=>'bool'], 'XMLWriter::startAttributeNs' => ['bool', 'prefix'=>'?string', 'name'=>'string', 'namespace'=>'?string'], 'XMLWriter::writeAttributeNs' => ['bool', 'prefix'=>'?string', 'name'=>'string', 'namespace'=>'?string', 'value'=>'string'], -'XMLWriter::writeDtdEntity' => ['bool', 'name'=>'string', 'content'=>'string', 'isParam'=>'bool', 'publicId'=>'?string', 'systemId'=>'?string', 'notationData'=>'?string'], +'XMLWriter::writeDtdEntity' => ['bool', 'name'=>'string', 'content'=>'string', 'isParam='=>'bool', 'publicId='=>'?string', 'systemId='=>'?string', 'notationData='=>'?string'], 'xmlwriter_end_attribute' => ['bool', 'writer'=>'XMLWriter'], 'xmlwriter_end_cdata' => ['bool', 'writer'=>'XMLWriter'], 'xmlwriter_end_comment' => ['bool', 'writer'=>'XMLWriter'], @@ -298,15 +298,15 @@ 'xmlwriter_start_pi' => ['bool', 'writer'=>'XMLWriter', 'target'=>'string'], 'xmlwriter_text' => ['bool', 'writer'=>'XMLWriter', 'content'=>'string'], 'xmlwriter_write_attribute' => ['bool', 'writer'=>'XMLWriter', 'name'=>'string', 'value'=>'string'], -'xmlwriter_write_attribute_ns' => ['bool', 'writer'=>'XMLWriter', 'prefix'=>'?string', 'name'=>'string', 'namespace'=>'string', 'value'=>'?string'], +'xmlwriter_write_attribute_ns' => ['bool', 'writer'=>'XMLWriter', 'prefix'=>'?string', 'name'=>'string', '?namespace'=>'string', 'value'=>'string'], 'xmlwriter_write_cdata' => ['bool', 'writer'=>'XMLWriter', 'content'=>'string'], 'xmlwriter_write_comment' => ['bool', 'writer'=>'XMLWriter', 'content'=>'string'], 'xmlwriter_write_dtd' => ['bool', 'writer'=>'XMLWriter', 'name'=>'string', 'publicId='=>'?string', 'systemId='=>'?string', 'content='=>'?string'], 'xmlwriter_write_dtd_attlist' => ['bool', 'writer'=>'XMLWriter', 'name'=>'string', 'content'=>'string'], 'xmlwriter_write_dtd_element' => ['bool', 'writer'=>'XMLWriter', 'name'=>'string', 'content'=>'string'], -'xmlwriter_write_dtd_entity' => ['bool', 'writer'=>'XMLWriter', 'name'=>'string', 'content'=>'string', 'isParam'=>'bool', 'publicId'=>'?string', 'systemId'=>'?string', 'notationData'=>'?string'], -'xmlwriter_write_element' => ['bool', 'writer'=>'XMLWriter', 'name'=>'string', 'content'=>'?string'], -'xmlwriter_write_element_ns' => ['bool', 'writer'=>'XMLWriter', 'prefix'=>'?string', 'name'=>'string', 'namespace'=>'string', 'content'=>'?string'], +'xmlwriter_write_dtd_entity' => ['bool', 'writer'=>'XMLWriter', 'name'=>'string', 'content'=>'string', 'isParam='=>'bool', 'publicId='=>'?string', 'systemId='=>'?string', 'notationData='=>'?string'], +'xmlwriter_write_element' => ['bool', 'writer'=>'XMLWriter', 'name'=>'string', 'content='=>'?string'], +'xmlwriter_write_element_ns' => ['bool', 'writer'=>'XMLWriter', 'prefix'=>'?string', 'name'=>'string', 'namespace'=>'?string', 'content='=>'?string'], 'xmlwriter_write_pi' => ['bool', 'writer'=>'XMLWriter', 'target'=>'string', 'content'=>'string'], 'xmlwriter_write_raw' => ['bool', 'writer'=>'XMLWriter', 'content'=>'string'], ],