summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@gmail.com>2017-02-23 11:02:37 +0800
committerXinchen Hui <laruence@gmail.com>2017-02-23 11:02:37 +0800
commit48fcc5ddc2771a51dcd0ab881068f26b2af2b77a (patch)
treec5b3110c5138e7b1180313fc09f06a87b71d1efa
parentd444e017fbd796d4035a9920c563062669ffbaa9 (diff)
parent1d4eead995ed8bd437aec578568aaee0075d17b0 (diff)
downloadphp-git-48fcc5ddc2771a51dcd0ab881068f26b2af2b77a.tar.gz
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0: Fixed bug #74148 (ReflectionFunction incorrectly reports the number of arguments)
-rw-r--r--ext/standard/basic_functions.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index c9b2c4778e..4d34e8d476 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -1194,6 +1194,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_fputcsv, 0, 0, 2)
ZEND_ARG_INFO(0, fields) /* ARRAY_INFO(0, fields, 1) */
ZEND_ARG_INFO(0, delimiter)
ZEND_ARG_INFO(0, enclosure)
+ ZEND_ARG_INFO(0, escape_char)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_fgetcsv, 0, 0, 1)