Skip to content

Commit 2458dab

Browse files
committed
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1: Fix arginfo wrt. optional/required parameters
2 parents 096fd88 + 6b5597f commit 2458dab

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ PHP NEWS
2222
. Fixed bug #76477 (Opcache causes empty return value).
2323
(Nikita, Laruence)
2424

25+
- phpdbg:
26+
. Fix arginfo wrt. optional/required parameters. (cmb)
27+
2528
- Standard:
2629
. Fixed bug #76505 (array_merge_recursive() is duplicating sub-array keys).
2730
(Laruence)

sapi/phpdbg/phpdbg.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -756,16 +756,16 @@ ZEND_BEGIN_ARG_INFO_EX(phpdbg_break_function_arginfo, 0, 0, 1)
756756
ZEND_ARG_INFO(0, function)
757757
ZEND_END_ARG_INFO()
758758

759-
ZEND_BEGIN_ARG_INFO_EX(phpdbg_color_arginfo, 0, 0, 0)
759+
ZEND_BEGIN_ARG_INFO_EX(phpdbg_color_arginfo, 0, 0, 2)
760760
ZEND_ARG_INFO(0, element)
761761
ZEND_ARG_INFO(0, color)
762762
ZEND_END_ARG_INFO()
763763

764-
ZEND_BEGIN_ARG_INFO_EX(phpdbg_prompt_arginfo, 0, 0, 0)
764+
ZEND_BEGIN_ARG_INFO_EX(phpdbg_prompt_arginfo, 0, 0, 1)
765765
ZEND_ARG_INFO(0, string)
766766
ZEND_END_ARG_INFO()
767767

768-
ZEND_BEGIN_ARG_INFO_EX(phpdbg_exec_arginfo, 0, 0, 0)
768+
ZEND_BEGIN_ARG_INFO_EX(phpdbg_exec_arginfo, 0, 0, 1)
769769
ZEND_ARG_INFO(0, context)
770770
ZEND_END_ARG_INFO()
771771

0 commit comments

Comments
 (0)