Skip to content

Commit 0778359

Browse files
committed
Merge branch 'PHP-7.2'
* PHP-7.2: Fix arginfo wrt. optional/required parameters
2 parents d169d06 + 2458dab commit 0778359

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
@@ -17,6 +17,9 @@ PHP NEWS
1717
. Fixed bug #76514 (Regression in preg_match makes it fail with
1818
PREG_JIT_STACKLIMIT_ERROR). (Anatol)
1919

20+
- phpdbg:
21+
. Fix arginfo wrt. optional/required parameters. (cmb)
22+
2023
- Standard:
2124
. Fixed bug #76505 (array_merge_recursive() is duplicating sub-array keys).
2225
(Laruence)

sapi/phpdbg/phpdbg.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -751,16 +751,16 @@ ZEND_BEGIN_ARG_INFO_EX(phpdbg_break_function_arginfo, 0, 0, 1)
751751
ZEND_ARG_INFO(0, function)
752752
ZEND_END_ARG_INFO()
753753

754-
ZEND_BEGIN_ARG_INFO_EX(phpdbg_color_arginfo, 0, 0, 0)
754+
ZEND_BEGIN_ARG_INFO_EX(phpdbg_color_arginfo, 0, 0, 2)
755755
ZEND_ARG_INFO(0, element)
756756
ZEND_ARG_INFO(0, color)
757757
ZEND_END_ARG_INFO()
758758

759-
ZEND_BEGIN_ARG_INFO_EX(phpdbg_prompt_arginfo, 0, 0, 0)
759+
ZEND_BEGIN_ARG_INFO_EX(phpdbg_prompt_arginfo, 0, 0, 1)
760760
ZEND_ARG_INFO(0, string)
761761
ZEND_END_ARG_INFO()
762762

763-
ZEND_BEGIN_ARG_INFO_EX(phpdbg_exec_arginfo, 0, 0, 0)
763+
ZEND_BEGIN_ARG_INFO_EX(phpdbg_exec_arginfo, 0, 0, 1)
764764
ZEND_ARG_INFO(0, context)
765765
ZEND_END_ARG_INFO()
766766

0 commit comments

Comments
 (0)