[php-src] master: Merge branch 'PHP-8.5' into PHP-8.6

Author: ndossche (ndossche) Date: 2026-10-11T01:38:22+02:00 Commit: https://github.com/php/php-src/commit/96de5492c88ab50bdfde5932b7e0579816ae31d6 Raw diff: https://github.com/php/php-src/commit/96de5492c88ab50bdfde5932b7e0579816ae31d6.diff Merge branch 'PHP-8.5' into PHP-8.6 * PHP-8.5: phpdbg: Fix wrong command names 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 641488d813fb..7abff44fbb10 100644 --- a/NEWS +++ b/NEWS @@ -28,6 +28,9 @@ PHP NEWS . Fix OSS-Fuzz #568005340 (FETCH_DIM_FUNC_ARG partial conversion). (ndossche) . Fix exception checks due to NAN warnings and object empty()'s. (ndossche) +- Phpdbg: + . Fix wrong command names. (ndossche, Weilin Du) + - Phar: . Fixed GH-24166 (Double-free in Phar::webPhar() in CGI without PATH_INFO). (RigelYoung, Jakub Zelenka) diff --git a/sapi/phpdbg/phpdbg_break.c b/sapi/phpdbg/phpdbg_break.c index 801c8b36b0ce..ed38c085a562 100644 --- a/sapi/phpdbg/phpdbg_break.c +++ b/sapi/phpdbg/phpdbg_break.c @@ -24,7 +24,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 2100d6e7dca4..306293993f32 100644 --- a/sapi/phpdbg/phpdbg_info.c +++ b/sapi/phpdbg/phpdbg_info.c @@ -24,7 +24,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 3931fc9c1525..f28c42033840 100644 --- a/sapi/phpdbg/phpdbg_list.c +++ b/sapi/phpdbg/phpdbg_list.c @@ -32,7 +32,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 0ece32d0b1c4..c931c73eebc6 100644 --- a/sapi/phpdbg/phpdbg_print.c +++ b/sapi/phpdbg/phpdbg_print.c @@ -24,7 +24,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 3fbfa3cc8b07..99ffd10368ac 100644 --- a/sapi/phpdbg/phpdbg_set.c +++ b/sapi/phpdbg/phpdbg_set.c @@ -24,7 +24,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>