diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2018-02-23 11:28:16 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2018-02-23 11:29:21 +0100 |
| commit | c6cf3d4ada79830fab28778aedb15af66bf238ab (patch) | |
| tree | 458131a8e050bfc068cbada0c454170ac07b3380 /ext/standard | |
| parent | 2577cdbea2d8c6accd0cb311ee4490ee24d637fd (diff) | |
| parent | 0b8cfa6c786536947cfa0be1aad0e396096aded7 (diff) | |
| download | php-git-c6cf3d4ada79830fab28778aedb15af66bf238ab.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix some arginfos
Diffstat (limited to 'ext/standard')
| -rw-r--r-- | ext/standard/basic_functions.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index f2bafb1145..2ce900d512 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -632,7 +632,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_long2ip, 0) ZEND_ARG_INFO(0, proper_address) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_getenv, 0, 0, 1) +ZEND_BEGIN_ARG_INFO_EX(arginfo_getenv, 0, 0, 0) ZEND_ARG_INFO(0, varname) ZEND_ARG_INFO(0, local_only) ZEND_END_ARG_INFO() @@ -1382,7 +1382,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_vfprintf, 0) ZEND_END_ARG_INFO() /* }}} */ /* {{{ fsock.c */ -ZEND_BEGIN_ARG_INFO_EX(arginfo_fsockopen, 0, 0, 2) +ZEND_BEGIN_ARG_INFO_EX(arginfo_fsockopen, 0, 0, 1) ZEND_ARG_INFO(0, hostname) ZEND_ARG_INFO(0, port) ZEND_ARG_INFO(1, errno) @@ -1390,7 +1390,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_fsockopen, 0, 0, 2) ZEND_ARG_INFO(0, timeout) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_pfsockopen, 0, 0, 2) +ZEND_BEGIN_ARG_INFO_EX(arginfo_pfsockopen, 0, 0, 1) ZEND_ARG_INFO(0, hostname) ZEND_ARG_INFO(0, port) ZEND_ARG_INFO(1, errno) @@ -2197,7 +2197,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_implode, 0) ZEND_ARG_INFO(0, pieces) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO(arginfo_strtok, 0) +ZEND_BEGIN_ARG_INFO_EX(arginfo_strtok, 0, 0, 1) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, token) ZEND_END_ARG_INFO() @@ -2463,7 +2463,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_str_split, 0, 0, 1) ZEND_ARG_INFO(0, split_length) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_strpbrk, 0, 0, 1) +ZEND_BEGIN_ARG_INFO_EX(arginfo_strpbrk, 0, 0, 2) ZEND_ARG_INFO(0, haystack) ZEND_ARG_INFO(0, char_list) ZEND_END_ARG_INFO() |