Skip to content

Commit 1dd3bab

Browse files
committed
Merge sapi/phpdbg into PHP-5.6
2 parents 959a006 + 58c6974 commit 1dd3bab

File tree

6 files changed

+662
-503
lines changed

6 files changed

+662
-503
lines changed

Diff for: sapi/phpdbg/phpdbg_help.c

+4-3
Original file line numberDiff line numberDiff line change
@@ -318,8 +318,9 @@ phpdbg_help_text_t phpdbg_help_text[] = {
318318
"**Information**" CR
319319
" **list** list PHP source" CR
320320
" **info** displays information on the debug session" CR
321-
" **print** show opcodes " CR
321+
" **print** show opcodes" CR
322322
" **frame** select a stack frame and print a stack frame summary" CR
323+
" **back** shows the current backtrace" CR
323324
" **help** provide help on a topic" CR CR
324325

325326
"**Starting and Stopping Execution**" CR
@@ -613,7 +614,7 @@ phpdbg_help_text_t phpdbg_help_text[] = {
613614
{"finish",
614615
"The **finish** command causes control to be passed back to the vm, continuing execution. Any "
615616
"breakpoints that are encountered within the current stack frame will be skipped. Execution "
616-
"will then continue until the next breakpoint after leaving the stack frame or unitil "
617+
"will then continue until the next breakpoint after leaving the stack frame or until "
617618
"completion of the script" CR CR
618619

619620
"Note when **step**ping is enabled, any opcode steps within the current stack frame are also "
@@ -629,7 +630,7 @@ phpdbg_help_text_t phpdbg_help_text[] = {
629630

630631
"**Examples**" CR CR
631632
" $P frame 2" CR
632-
" $P E $count" CR
633+
" $P ev $count" CR
633634
" Go to frame 2 and print out variable **$count** in that frame" CR CR
634635

635636
"Note that this frame scope is discarded when execution continues, with the execution frame "

0 commit comments

Comments
 (0)