[php-src] PHP-8.6: phpdbg: Fix wrong command names

Author: ndossche (ndossche) Date: 2026-10-11T01:37:26+02:00 Commit: https://github.com/php/php-src/commit/f735f33d4920f9e67f65ee84ecb0fd839dbfb7c3 Raw diff: https://github.com/php/php-src/commit/f735f33d4920f9e67f65ee84ecb0fd839dbfb7c3.diff phpdbg: Fix wrong command names Closes GH-24054. Co-authored-by: Weilin Du <weilindu@php.net> Changed paths: A sapi/phpdbg/tests/subcommand_parent_name.phpt M NEWS M sapi/phpdbg/phpdbg_break.c M sapi/phpdbg/phpdbg_info.c M sapi/phpdbg/phpdbg_list.c M sapi/phpdbg/phpdbg_print.c M sapi/phpdbg/phpdbg_set.c Diff: diff --git a/NEWS b/NEWS index 942a8e9b0651..491e526d6b8f 100644 --- a/NEWS +++ b/NEWS @@ -37,6 +37,9 @@ PHP NEWS . Fixed bug GH-24218 (Invalid opcode for count() of a literal array when SCCP is disabled). (Lazizbek Ergashev) +- Phpdbg: + . Fix wrong command names. (ndossche, Weilin Du) + - SOAP: . Fixed use of uninitialized func in do_request() on OOM bailout. (David Carlier) diff --git a/sapi/phpdbg/phpdbg_break.c b/sapi/phpdbg/phpdbg_break.c index 481e4b8693be..95f25c438632 100644 --- a/sapi/phpdbg/phpdbg_break.c +++ b/sapi/phpdbg/phpdbg_break.c @@ -26,7 +26,7 @@ ZEND_EXTERN_MODULE_GLOBALS(phpdbg) #define PHPDBG_BREAK_COMMAND_D(f, h, a, m, l, s, flags) \ - PHPDBG_COMMAND_D_EXP(f, h, a, m, l, s, &phpdbg_prompt_commands[9], flags) + PHPDBG_COMMAND_D_EXP(f, h, a, m, l, s, &phpdbg_prompt_commands[11], flags) /** * Commands diff --git a/sapi/phpdbg/phpdbg_info.c b/sapi/phpdbg/phpdbg_info.c index d64703755cbe..833240d3bfcd 100644 --- a/sapi/phpdbg/phpdbg_info.c +++ b/sapi/phpdbg/phpdbg_info.c @@ -26,7 +26,7 @@ ZEND_EXTERN_MODULE_GLOBALS(phpdbg) #define PHPDBG_INFO_COMMAND_D(f, h, a, m, l, s, flags) \ - PHPDBG_COMMAND_D_EXP(f, h, a, m, l, s, &phpdbg_prompt_commands[13], flags) + PHPDBG_COMMAND_D_EXP(f, h, a, m, l, s, &phpdbg_prompt_commands[15], flags) const phpdbg_command_t phpdbg_info_commands[] = { PHPDBG_INFO_COMMAND_D(break, "show breakpoints", 'b', info_break, NULL, 0, PHPDBG_ASYNC_SAFE), diff --git a/sapi/phpdbg/phpdbg_list.c b/sapi/phpdbg/phpdbg_list.c index 00ef995d897e..415dc294c9ad 100644 --- a/sapi/phpdbg/phpdbg_list.c +++ b/sapi/phpdbg/phpdbg_list.c @@ -34,7 +34,7 @@ ZEND_EXTERN_MODULE_GLOBALS(phpdbg) #define PHPDBG_LIST_COMMAND_D(f, h, a, m, l, s, flags) \ - PHPDBG_COMMAND_D_EXP(f, h, a, m, l, s, &phpdbg_prompt_commands[12], flags) + PHPDBG_COMMAND_D_EXP(f, h, a, m, l, s, &phpdbg_prompt_commands[14], flags) const phpdbg_command_t phpdbg_list_commands[] = { PHPDBG_LIST_COMMAND_D(lines, "lists the specified lines", 'l', list_lines, NULL, "l", PHPDBG_ASYNC_SAFE), diff --git a/sapi/phpdbg/phpdbg_print.c b/sapi/phpdbg/phpdbg_print.c index b0f8d4cb2940..9938ba006574 100644 --- a/sapi/phpdbg/phpdbg_print.c +++ b/sapi/phpdbg/phpdbg_print.c @@ -26,7 +26,7 @@ ZEND_EXTERN_MODULE_GLOBALS(phpdbg) #define PHPDBG_PRINT_COMMAND_D(f, h, a, m, l, s, flags) \ - PHPDBG_COMMAND_D_EXP(f, h, a, m, l, s, &phpdbg_prompt_commands[8], flags) + PHPDBG_COMMAND_D_EXP(f, h, a, m, l, s, &phpdbg_prompt_commands[10], flags) const phpdbg_command_t phpdbg_print_commands[] = { PHPDBG_PRINT_COMMAND_D(exec, "print out the instructions in the main execution context", 'e', print_exec, NULL, 0, PHPDBG_ASYNC_SAFE), diff --git a/sapi/phpdbg/phpdbg_set.c b/sapi/phpdbg/phpdbg_set.c index d6b19a7e551a..d6b747e366d2 100644 --- a/sapi/phpdbg/phpdbg_set.c +++ b/sapi/phpdbg/phpdbg_set.c @@ -26,7 +26,7 @@ ZEND_EXTERN_MODULE_GLOBALS(phpdbg) #define PHPDBG_SET_COMMAND_D(f, h, a, m, l, s, flags) \ - PHPDBG_COMMAND_D_EXP(f, h, a, m, l, s, &phpdbg_prompt_commands[17], flags) + PHPDBG_COMMAND_D_EXP(f, h, a, m, l, s, &phpdbg_prompt_commands[19], flags) const phpdbg_command_t phpdbg_set_commands[] = { PHPDBG_SET_COMMAND_D(prompt, "usage: set prompt [<string>]", 'p', set_prompt, NULL, "|s", 0), diff --git a/sapi/phpdbg/tests/subcommand_parent_name.phpt b/sapi/phpdbg/tests/subcommand_parent_name.phpt new file mode 100644 index 000000000000..f1ac34fcc06b --- /dev/null +++ b/sapi/phpdbg/tests/subcommand_parent_name.phpt @@ -0,0 +1,16 @@ +--TEST-- +Subcommand error messages name the correct parent command +--PHPDBG-- +list lines +print func +break at +info literal 1 +set prompt 1 +q +--EXPECT-- +prompt> [The command "list lines" expected at least 1 arguments (l) and received 0] +prompt> [The command "print func" expected string and got nothing at parameter 1] +prompt> [The command "break at" expected at least 2 arguments (*c) and received 0] +prompt> [The command "info literal" expected no arguments] +prompt> [The command "set prompt" expected string and got numeric at parameter 1] +prompt>