diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2018-06-25 11:54:02 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2018-06-25 11:54:45 +0200 |
| commit | 2458dab466cbc8088a9c5ac4eff3785321ea55c8 (patch) | |
| tree | 8b57f8b4857c720d75b3d88abeff516b12f60fa6 | |
| parent | 096fd88dcb8b30391ce36b1e70eebfbe673b0b0d (diff) | |
| parent | 6b5597f7d8e31933dfb833dd443290adc02ca307 (diff) | |
| download | php-git-2458dab466cbc8088a9c5ac4eff3785321ea55c8.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix arginfo wrt. optional/required parameters
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg.c | 6 |
2 files changed, 6 insertions, 3 deletions
@@ -22,6 +22,9 @@ PHP NEWS . Fixed bug #76477 (Opcache causes empty return value). (Nikita, Laruence) +- phpdbg: + . Fix arginfo wrt. optional/required parameters. (cmb) + - Standard: . Fixed bug #76505 (array_merge_recursive() is duplicating sub-array keys). (Laruence) diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c index 64cb80df09..5af6ba619b 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -756,16 +756,16 @@ ZEND_BEGIN_ARG_INFO_EX(phpdbg_break_function_arginfo, 0, 0, 1) ZEND_ARG_INFO(0, function) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(phpdbg_color_arginfo, 0, 0, 0) +ZEND_BEGIN_ARG_INFO_EX(phpdbg_color_arginfo, 0, 0, 2) ZEND_ARG_INFO(0, element) ZEND_ARG_INFO(0, color) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(phpdbg_prompt_arginfo, 0, 0, 0) +ZEND_BEGIN_ARG_INFO_EX(phpdbg_prompt_arginfo, 0, 0, 1) ZEND_ARG_INFO(0, string) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(phpdbg_exec_arginfo, 0, 0, 0) +ZEND_BEGIN_ARG_INFO_EX(phpdbg_exec_arginfo, 0, 0, 1) ZEND_ARG_INFO(0, context) ZEND_END_ARG_INFO() |