]> granicus.if.org Git - php/commitdiff
Fix arginfo wrt. optional/required parameters
authorChristoph M. Becker <cmbecker69@gmx.de>
Fri, 22 Jun 2018 13:45:31 +0000 (15:45 +0200)
committerChristoph M. Becker <cmbecker69@gmx.de>
Mon, 25 Jun 2018 09:52:17 +0000 (11:52 +0200)
All parameters of phpdbg_color(), phpdbg_exec() and phpdbg_prompt() are
required.  We mark them as such.

NEWS
sapi/phpdbg/phpdbg.c

diff --git a/NEWS b/NEWS
index 1dab097ba9199f8da1eb038d5e1c5918d9f5d93b..79612ca2bd500023ebea7e646f6bf05e8e1d1b1d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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)
index 48784b28adeb172da19c77e5b6ddf9c5ed577b3b..70ced5793d00ca5f4e4d0edbe7d88b452dfe3f5c 100644 (file)
@@ -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()