From: Ivan Enderlin Date: Wed, 18 Dec 2013 10:53:30 +0000 (+0100) Subject: In english, no horizontal space before “!”. X-Git-Tag: php-5.6.0alpha1~110^2~9^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e5263aa3f0c9138cfeb1241f296e1404b705b904;p=php In english, no horizontal space before “!”. --- diff --git a/README.md b/README.md index 57178fc5c9..fdc1fa1f39 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Features - Userland API - SAPI Agnostic - Easily Integrated - PHP Configuration File Support - - JIT Super Globals - Set Your Own !! + - JIT Super Globals - Set Your Own!! - Optional readline Support - Comfortable Terminal Operation - Remote Debugging Support - Bundled Java GUI - Easy Operation - See Help :) diff --git a/phpdbg_break.c b/phpdbg_break.c index 358318ea1b..1423b960e6 100644 --- a/phpdbg_break.c +++ b/phpdbg_break.c @@ -105,7 +105,7 @@ PHPDBG_BREAK(lineno) /* {{{ */ if (PHPDBG_G(exec)) { phpdbg_set_breakpoint_file(phpdbg_current_file(TSRMLS_C), param->num TSRMLS_CC); } else { - phpdbg_error("Execution context not set !"); + phpdbg_error("Execution context not set!"); } } break; diff --git a/phpdbg_cmd.c b/phpdbg_cmd.c index 15fb33ffd3..9f052d6f6f 100644 --- a/phpdbg_cmd.c +++ b/phpdbg_cmd.c @@ -472,7 +472,7 @@ PHPDBG_API phpdbg_input_t *phpdbg_read_input(char *buffered TSRMLS_DC) /* {{{ */ if ((!(PHPDBG_G(flags) & PHPDBG_IS_REMOTE) && !phpdbg_write(phpdbg_get_prompt(TSRMLS_C))) || !fgets(buf, PHPDBG_MAX_CMD, PHPDBG_G(io)[PHPDBG_STDIN])) { /* the user has gone away */ - phpdbg_error("Failed to read console !"); + phpdbg_error("Failed to read console!"); PHPDBG_G(flags) |= (PHPDBG_IS_QUITTING|PHPDBG_IS_DISCONNECTED); zend_bailout(); return NULL; @@ -489,7 +489,7 @@ PHPDBG_API phpdbg_input_t *phpdbg_read_input(char *buffered TSRMLS_DC) /* {{{ */ if (!cmd) { /* the user has gone away */ - phpdbg_error("Failed to read console !"); + phpdbg_error("Failed to read console!"); PHPDBG_G(flags) |= (PHPDBG_IS_QUITTING|PHPDBG_IS_DISCONNECTED); zend_bailout(); return NULL; @@ -646,7 +646,7 @@ PHPDBG_API int phpdbg_do_cmd(const phpdbg_command_t *command, phpdbg_input_t *in rc = command->handler(¶m, input TSRMLS_CC); - /* only set last command when it is worth it ! */ + /* only set last command when it is worth it! */ if ((rc != FAILURE) && !(PHPDBG_G(flags) & PHPDBG_IS_INITIALIZING)) { PHPDBG_G(lcmd) = (phpdbg_command_t*) command; @@ -661,7 +661,7 @@ PHPDBG_API int phpdbg_do_cmd(const phpdbg_command_t *command, phpdbg_input_t *in } else { /* this should NEVER happen */ phpdbg_error( - "No function executed !!"); + "No function executed!!"); } return rc; diff --git a/phpdbg_help.c b/phpdbg_help.c index fb2e9b71f3..b61ad9942b 100644 --- a/phpdbg_help.c +++ b/phpdbg_help.c @@ -201,7 +201,7 @@ PHPDBG_HELP(run) /* {{{ */ PHPDBG_HELP(eval) /* {{{ */ { phpdbg_help_header(); - phpdbg_writeln("Access to eval() allows you to change the environment during execution, careful though !!"); + phpdbg_writeln("Access to eval() allows you to change the environment during execution, careful though!!"); phpdbg_writeln(EMPTY); phpdbg_notice("Examples"); phpdbg_writeln("\t%seval $variable", phpdbg_get_prompt(TSRMLS_C)); @@ -293,7 +293,7 @@ PHPDBG_HELP(break) /* {{{ */ ++break_command; } } - phpdbg_writeln("Note: Conditional breaks are costly, use them sparingly !"); + phpdbg_writeln("Note: Conditional breaks are costly, use them sparingly!"); phpdbg_help_footer(); return SUCCESS; } /* }}} */ @@ -415,7 +415,7 @@ PHPDBG_HELP(list) /* {{{ */ phpdbg_writeln("\t%sl c myClass", phpdbg_get_prompt(TSRMLS_C)); phpdbg_writeln("\tWill print the source of \"myClass\""); phpdbg_writeln(EMPTY); - phpdbg_writeln("Note: before listing functions you must have a populated function table, try compile !!"); + phpdbg_writeln("Note: before listing functions you must have a populated function table, try compile!!"); phpdbg_writeln(EMPTY); phpdbg_notice("The parameters enclosed by [] are usually optional, but help avoid ambigious commands"); phpdbg_writeln(EMPTY); @@ -561,7 +561,7 @@ PHPDBG_HELP(shell) /* {{{ */ phpdbg_writeln("\t%s- ls /usr/src/php-src", phpdbg_get_prompt(TSRMLS_C)); phpdbg_writeln("\tWill execute ls /usr/src/php-src, displaying the output in the console"); phpdbg_writeln(EMPTY); - phpdbg_writeln("Note: read only commands please !"); + phpdbg_writeln("Note: read only commands please!"); phpdbg_help_footer(); return SUCCESS; } /* }}} */ @@ -583,8 +583,8 @@ PHPDBG_HELP(options) /* {{{ */ phpdbg_writeln(" -I\tN/A\t\t\tIgnore default .phpdbginit"); phpdbg_writeln(" -O\t-Omy.oplog\t\tSets oplog output file"); phpdbg_writeln(" -r\tN/A\t\t\tRun execution context"); - phpdbg_writeln(" -E\tN/A\t\t\tEnable step through eval, careful !"); - phpdbg_writeln(" -S\t-Scli\t\t\tOverride SAPI name, careful !"); + phpdbg_writeln(" -E\tN/A\t\t\tEnable step through eval, careful!"); + phpdbg_writeln(" -S\t-Scli\t\t\tOverride SAPI name, careful!"); #ifndef _WIN32 phpdbg_writeln(" -l\t-l4000\t\t\tSetup remote console ports"); phpdbg_writeln(" -a\t-a192.168.0.3\t\tSetup remote console bind address"); diff --git a/phpdbg_info.c b/phpdbg_info.c index 25909deca5..1744f59215 100644 --- a/phpdbg_info.c +++ b/phpdbg_info.c @@ -223,7 +223,7 @@ PHPDBG_INFO(literal) /* {{{ */ literal++; } } else { - phpdbg_error("Not executing !"); + phpdbg_error("Not executing!"); } return SUCCESS; @@ -244,7 +244,7 @@ PHPDBG_INFO(memory) /* {{{ */ phpdbg_writeln("|-------> Real:\t%.3f kB", (float) (zend_memory_peak_usage(1 TSRMLS_CC)/1024)); } else { - phpdbg_error("Memory Manager Disabled !"); + phpdbg_error("Memory Manager Disabled!"); } return SUCCESS; } /* }}} */ diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c index c42b8d1efb..f2f482b7ec 100644 --- a/phpdbg_prompt.c +++ b/phpdbg_prompt.c @@ -508,7 +508,7 @@ static inline void phpdbg_handle_exception(TSRMLS_D) /* }}} */ EG(exception) = NULL; phpdbg_error( - "Uncaught %s !", + "Uncaught %s!", Z_OBJCE(exception)->name); /* call __toString */ @@ -716,7 +716,7 @@ PHPDBG_COMMAND(print) /* {{{ */ PHPDBG_COMMAND(info) /* {{{ */ { phpdbg_error( - "No information command selected !"); + "No information command selected!"); return SUCCESS; } /* }}} */ @@ -724,7 +724,7 @@ PHPDBG_COMMAND(info) /* {{{ */ PHPDBG_COMMAND(set) /* {{{ */ { phpdbg_error( - "No information command selected !"); + "No information command selected!"); return SUCCESS; } /* }}} */ @@ -744,7 +744,7 @@ PHPDBG_COMMAND(break) /* {{{ */ if (PHPDBG_G(exec)) { phpdbg_set_breakpoint_file(phpdbg_current_file(TSRMLS_C), param->num TSRMLS_CC); } else { - phpdbg_error("Execution context not set !"); + phpdbg_error("Execution context not set!"); } break; case METHOD_PARAM: diff --git a/phpdbg_set.c b/phpdbg_set.c index e6c332112e..2472e1868c 100644 --- a/phpdbg_set.c +++ b/phpdbg_set.c @@ -178,7 +178,7 @@ PHPDBG_SET(oplog) /* {{{ */ fclose( PHPDBG_G(oplog)); } else { - phpdbg_error("Oplog is not enabled !"); + phpdbg_error("Oplog is not enabled!"); } } break; } break; diff --git a/test.php b/test.php index 744ed79865..faea3c2fab 100644 --- a/test.php +++ b/test.php @@ -30,7 +30,7 @@ function test($x, $y = 0) { $dbg = new phpdbg(); var_dump( - $dbg->isGreat("PHP Rocks !!")); + $dbg->isGreat("PHP Rocks!!")); foreach (test(1,2) as $gen) continue; diff --git a/tests/run-tests.php b/tests/run-tests.php index 99edba01b4..1fb6fa1224 100644 --- a/tests/run-tests.php +++ b/tests/run-tests.php @@ -421,7 +421,7 @@ namespace phpdbg\testing { } /** - * Obvious !! + * Obvious!! * */ public function getResult() { diff --git a/tutorials/intro.md b/tutorials/intro.md index 0442413499..34ec1b20ba 100644 --- a/tutorials/intro.md +++ b/tutorials/intro.md @@ -80,7 +80,7 @@ class phpdbg { $dbg = new phpdbg(); -var_dump($dbg->isGreat("PHP Rocks !!")); +var_dump($dbg->isGreat("PHP Rocks!!")); ?> ``` diff --git a/tutorials/java/src/phpdbg/ui/JConsole.form b/tutorials/java/src/phpdbg/ui/JConsole.form index 2db69b086d..d2808942db 100644 --- a/tutorials/java/src/phpdbg/ui/JConsole.form +++ b/tutorials/java/src/phpdbg/ui/JConsole.form @@ -180,7 +180,7 @@ - + diff --git a/tutorials/java/src/phpdbg/ui/JConsole.java b/tutorials/java/src/phpdbg/ui/JConsole.java index 383e225a85..6c8cfb364b 100644 --- a/tutorials/java/src/phpdbg/ui/JConsole.java +++ b/tutorials/java/src/phpdbg/ui/JConsole.java @@ -121,7 +121,7 @@ public class JConsole extends javax.swing.JDialog { hostnameLabel.setText("Hostname:"); - input.setToolTipText("Enter phpdbg commands here !"); + input.setToolTipText("Enter phpdbg commands here!"); input.setEnabled(false); input.addKeyListener(new java.awt.event.KeyAdapter() { public void keyReleased(java.awt.event.KeyEvent evt) { @@ -344,7 +344,7 @@ public class JConsole extends javax.swing.JDialog { if (address != null && address.length() > 0) { return address; } else { - messageBox("Invalid hostname provided !", MessageType.WARN); + messageBox("Invalid hostname provided!", MessageType.WARN); } return null; @@ -354,7 +354,7 @@ public class JConsole extends javax.swing.JDialog { try { return Integer.parseInt(stdinPort.getText()); } catch (NumberFormatException ex) { - messageBox("Invalid stdin port provided !", MessageType.WARN); + messageBox("Invalid stdin port provided!", MessageType.WARN); } return 0; } @@ -363,7 +363,7 @@ public class JConsole extends javax.swing.JDialog { try { return Integer.parseInt(stdoutPort.getText()); } catch (NumberFormatException ex) { - messageBox("Invalid stdout port provided !", MessageType.WARN); + messageBox("Invalid stdout port provided!", MessageType.WARN); } return 0; } diff --git a/tutorials/simples.md b/tutorials/simples.md index d8b53d6979..18d0a01bb7 100644 --- a/tutorials/simples.md +++ b/tutorials/simples.md @@ -42,7 +42,7 @@ phpdbg> print class myClassName Introspection doesn't only provide you with names, but the addresses of every opcode in every statement, which you may use to specify with as much precision as is possible where to break execution. -**There is a print command for particular methods, useful if a class is very large and your screen is not !** +**There is a print command for particular methods, useful if a class is very large and your screen is not!** At this point, break points are set; the next thing to do is issue the run command: