diff options
| author | Timm Friebe <thekid@thekid.de> | 2014-07-06 17:07:01 +0200 |
|---|---|---|
| committer | Timm Friebe <thekid@thekid.de> | 2014-07-06 17:07:01 +0200 |
| commit | a1554ca6343598c38e4fb4fbcc46419ce0bdf058 (patch) | |
| tree | e66e73ff23a340cf7343459a0331a57b8eff65aa /sapi/phpdbg/phpdbg_prompt.h | |
| parent | e0d51d1cf00d43c57104764b620bb9219889a86d (diff) | |
| parent | 5b925824edf3edc951fc41608d5cbd07a0baab08 (diff) | |
| download | php-git-a1554ca6343598c38e4fb4fbcc46419ce0bdf058.tar.gz | |
Merge in changes from master
Now also includes "on [TYPE]" in "Call to a member function" error
Diffstat (limited to 'sapi/phpdbg/phpdbg_prompt.h')
| -rw-r--r-- | sapi/phpdbg/phpdbg_prompt.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sapi/phpdbg/phpdbg_prompt.h b/sapi/phpdbg/phpdbg_prompt.h index 6807d88f41..ef648aabeb 100644 --- a/sapi/phpdbg/phpdbg_prompt.h +++ b/sapi/phpdbg/phpdbg_prompt.h @@ -30,11 +30,10 @@ void phpdbg_clean(zend_bool full TSRMLS_DC); /* }}} */ /* {{{ phpdbg command handlers */ PHPDBG_COMMAND(exec); -PHPDBG_COMMAND(compile); PHPDBG_COMMAND(step); -PHPDBG_COMMAND(next); +PHPDBG_COMMAND(continue); PHPDBG_COMMAND(run); -PHPDBG_COMMAND(eval); +PHPDBG_COMMAND(ev); PHPDBG_COMMAND(until); PHPDBG_COMMAND(finish); PHPDBG_COMMAND(leave); @@ -47,13 +46,13 @@ PHPDBG_COMMAND(info); PHPDBG_COMMAND(clean); PHPDBG_COMMAND(clear); PHPDBG_COMMAND(help); -PHPDBG_COMMAND(quiet); -PHPDBG_COMMAND(aliases); -PHPDBG_COMMAND(shell); +PHPDBG_COMMAND(sh); PHPDBG_COMMAND(set); PHPDBG_COMMAND(source); +PHPDBG_COMMAND(export); PHPDBG_COMMAND(register); -PHPDBG_COMMAND(quit); /* }}} */ +PHPDBG_COMMAND(quit); +PHPDBG_COMMAND(watch); /* }}} */ /* {{{ prompt commands */ extern const phpdbg_command_t phpdbg_prompt_commands[]; /* }}} */ |