From: Nikita Popov <nikita.ppv@gmail.com>
Date: Mon, 7 Oct 2019 09:42:22 +0000 (+0200)
Subject: Fix number of required arguments in arginfo
X-Git-Tag: php-7.4.0RC4~47
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f085bddb51cf3ce4400f89447e40ddac66468f31;p=php

Fix number of required arguments in arginfo

* pack() only requires one argument
* stream_context_set_option() only requires two arguments
* ReflectionMethod::getClosure() accepts no args for static methods
* DOMDocument::createProcessingInstruction() only requires one arg
* DOMImplementation::createDocument() only requires two arguments
* DOMDocument::importNode() only requires one arg
* mysql_get_client_version() doesn't accept any args,
  despite what the docs say...
---

diff --git a/ext/dom/document.c b/ext/dom/document.c
index 672fd624b3..df1e7a8dfb 100644
--- a/ext/dom/document.c
+++ b/ext/dom/document.c
@@ -60,7 +60,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_create_cdatasection, 0, 0, 1)
 	ZEND_ARG_INFO(0, data)
 ZEND_END_ARG_INFO();
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_create_processing_instruction, 0, 0, 2)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_create_processing_instruction, 0, 0, 1)
 	ZEND_ARG_INFO(0, target)
 	ZEND_ARG_INFO(0, data)
 ZEND_END_ARG_INFO();
@@ -77,7 +77,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_get_elements_by_tag_name, 0, 0, 1)
 	ZEND_ARG_INFO(0, tagName)
 ZEND_END_ARG_INFO();
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_import_node, 0, 0, 2)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_import_node, 0, 0, 1)
 	ZEND_ARG_OBJ_INFO(0, importedNode, DOMNode, 0)
 	ZEND_ARG_INFO(0, deep)
 ZEND_END_ARG_INFO();
diff --git a/ext/dom/domimplementation.c b/ext/dom/domimplementation.c
index e80561a86e..05e99af39b 100644
--- a/ext/dom/domimplementation.c
+++ b/ext/dom/domimplementation.c
@@ -40,7 +40,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_implementation_create_documenttype, 0, 0, 3)
 	ZEND_ARG_INFO(0, systemId)
 ZEND_END_ARG_INFO();
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_implementation_create_document, 0, 0, 3)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_implementation_create_document, 0, 0, 2)
 	ZEND_ARG_INFO(0, namespaceURI)
 	ZEND_ARG_INFO(0, qualifiedName)
 	ZEND_ARG_OBJ_INFO(0, docType, DOMDocumentType, 0)
diff --git a/ext/mysqli/mysqli_fe.c b/ext/mysqli/mysqli_fe.c
index f17f009830..4869228ef2 100644
--- a/ext/mysqli/mysqli_fe.c
+++ b/ext/mysqli/mysqli_fe.c
@@ -448,7 +448,7 @@ const zend_function_entry mysqli_functions[] = {
 	PHP_FE(mysqli_get_charset,							arginfo_mysqli_only_link)
 #endif
 	PHP_FE(mysqli_get_client_info,						arginfo_mysqli_no_options)
-	PHP_FE(mysqli_get_client_version,					arginfo_mysqli_only_link)
+	PHP_FE(mysqli_get_client_version,					arginfo_mysqli_no_options)
 	PHP_FE(mysqli_get_links_stats,						arginfo_mysqli_no_options)
 	PHP_FE(mysqli_get_host_info,						arginfo_mysqli_only_link)
 	PHP_FE(mysqli_get_proto_info,						arginfo_mysqli_only_link)
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index 61f09ca643..e7df9bfa61 100644
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -6359,7 +6359,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_reflection_method_setAccessible, 0)
 	ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO(arginfo_reflection_method_getClosure, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_method_getClosure, 0, 0, 0)
 	ZEND_ARG_INFO(0, object)
 ZEND_END_ARG_INFO()
 
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index cb9be32852..001e37fa70 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -1806,7 +1806,7 @@ ZEND_END_ARG_INFO()
 #endif
 /* }}} */
 /* {{{ pack.c */
-ZEND_BEGIN_ARG_INFO_EX(arginfo_pack, 0, 0, 2)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_pack, 0, 0, 1)
 	ZEND_ARG_INFO(0, format)
 	ZEND_ARG_VARIADIC_INFO(0, args)
 ZEND_END_ARG_INFO()
@@ -2038,7 +2038,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_stream_context_get_options, 0)
 	ZEND_ARG_INFO(0, stream_or_context)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO(arginfo_stream_context_set_option, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_context_set_option, 0, 0, 2)
 	ZEND_ARG_INFO(0, stream_or_context)
 	ZEND_ARG_INFO(0, wrappername)
 	ZEND_ARG_INFO(0, optionname)