diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2018-06-22 15:45:31 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2018-06-25 11:52:17 +0200 |
| commit | 6b5597f7d8e31933dfb833dd443290adc02ca307 (patch) | |
| tree | b0953c7439f13f6faeef22aec2edb15ae287282f | |
| parent | 5af0db88fafe7b36d13c67bc641e0f3749e59d7d (diff) | |
| download | php-git-6b5597f7d8e31933dfb833dd443290adc02ca307.tar.gz | |
Fix arginfo wrt. optional/required parameters
All parameters of phpdbg_color(), phpdbg_exec() and phpdbg_prompt() are
required. We mark them as such.
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg.c | 6 |
2 files changed, 6 insertions, 3 deletions
@@ -13,6 +13,9 @@ PHP NEWS . Fixed bug #73342 (Vulnerability in php-fpm by changing stdin to non-blocking). (Nikita) +- 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 48784b28ad..70ced5793d 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() |