Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sapi/phpdbg/phpdbg_break.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion sapi/phpdbg/phpdbg_info.c
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
2 changes: 1 addition & 1 deletion sapi/phpdbg/phpdbg_list.c
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
2 changes: 1 addition & 1 deletion sapi/phpdbg/phpdbg_print.c
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
2 changes: 1 addition & 1 deletion sapi/phpdbg/phpdbg_set.c
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
16 changes: 16 additions & 0 deletions sapi/phpdbg/tests/subcommand_parent_name.phpt
Original file line number Diff line number Diff line change
@@ -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>
Loading