diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2018-01-11 13:12:19 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2018-01-11 13:13:49 +0100 |
| commit | 7e1d2bd82af81e0d464d659d054756c577dece88 (patch) | |
| tree | 3c479809f7adc1ac4b0b4f5a86bd899d9d25266a | |
| parent | 2dd80a078251273cdfd8d8fda71651e5ecc40040 (diff) | |
| parent | a843a86e6f21ecc497cdd3c98d9cd5feb999f357 (diff) | |
| download | php-git-7e1d2bd82af81e0d464d659d054756c577dece88.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #75799 (arg of get_defined_functions is optional)
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | Zend/zend_builtin_functions.c | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -9,6 +9,7 @@ PHP NEWS . Fixed bug #75614 (Some non-portable == in shell scripts). (jdolecek) . Fixed bug #75786 (segfault when using spread operator on generator passed by reference). (Nikita) + . Fixed bug #75799 (arg of get_defined_functions is optional). (carusogabriel) - Opcache: . Fixed bug #75687 (var 8 (TMP) has array key type but not value type). diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index 1bf8828d14..81c78f2a97 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -193,7 +193,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_set_exception_handler, 0, 0, 1) ZEND_ARG_INFO(0, exception_handler) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_get_defined_functions, 0, 0, 1) +ZEND_BEGIN_ARG_INFO_EX(arginfo_get_defined_functions, 0, 0, 0) ZEND_ARG_INFO(0, exclude_disabled) ZEND_END_ARG_INFO() |