MFH: Fixed error message grammar:

 - "cannot" instead of "can not" (meaning "also can")
 - "than" instead of "then" (Hint: "then" should hardly be needed;
     you're not telling the order in which to do something)

... plus removed a couple ending. dots

diff --git a/ext/dom/xpath.c b/ext/dom/xpath.c
index 167a744dc778b85124492de015b22144b8d71cf0..b8e3388eaa72b513bea7093883fc999d68aea253 100644 (file)
--- a/ext/dom/xpath.c
+++ b/ext/dom/xpath.c
@@ -232,7 +232,7 @@ static void dom_xpath_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs,
                        } else if (retval->type == IS_BOOL) {
                                valuePush(ctxt, xmlXPathNewBoolean(retval->value.lval));
                        } else if (retval->type == IS_OBJECT) {
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "A PHP Object can not be converted to a XPath-string");
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "A PHP Object cannot be converted to a XPath-string");
                                valuePush(ctxt, xmlXPathNewString((xmlChar *)""));
                        } else {
                                convert_to_string_ex(&retval);

diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index 668b5270e08dc73d777138f464c0e693dbb31697..7883c2e2c5c2d13b99684fa18d8b3644075dccd3 100644 (file)
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -3717,7 +3717,7 @@ PHP_FUNCTION(imap_mail_compose)
                        if (!cookie) {
                                cookie = "-";
                        } else if (strlen(cookie) > (SENDBUFLEN - 2 - 2 - 2)) { /* validate cookie length -- + CRLF * 2 */
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "The boudary should be no longer then 4kb");
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "The boundary should be no longer than 4kb");
                                RETVAL_FALSE;
                                goto done;
                        }

diff --git a/ext/mcrypt/mcrypt.c b/ext/mcrypt/mcrypt.c
index 5164a585f792c8b2d26833f8468bd5f74a8c78b2..1a5646eac17d1f8cb41c2b89b2ad5b0d11055cb8 100644 (file)
--- a/ext/mcrypt/mcrypt.c
+++ b/ext/mcrypt/mcrypt.c
@@ -1373,7 +1373,7 @@ PHP_FUNCTION(mcrypt_create_iv)
        }
 
        if (size <= 0 || size >= INT_MAX) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Can not create an IV with a size of less then 1 or greater then %d", INT_MAX);
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot create an IV with a size of less than 1 or greater than %d", INT_MAX);
                RETURN_FALSE;
        }
        

diff --git a/ext/odbc/birdstep.c b/ext/odbc/birdstep.c
index 83c8c87076976a24268763cc65cc2859d10f9d41..fa76ab97fd30294f754ec15e6bb8122e19a983a6 100644 (file)
--- a/ext/odbc/birdstep.c
+++ b/ext/odbc/birdstep.c
@@ -369,7 +369,7 @@ PHP_FUNCTION(birdstep_exec)
        }
        stat = SQLExecDirect(res->hstmt,query,SQL_NTS);
        if ( stat != SQL_SUCCESS && stat != SQL_SUCCESS_WITH_INFO ) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Birdstep: Can not execute \"%s\" query",query);
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Birdstep: Cannot execute \"%s\" query",query);
                SQLFreeStmt(res->hstmt,SQL_DROP);
                efree(res);
                RETURN_FALSE;

diff --git a/ext/posix/posix.c b/ext/posix/posix.c
index 786782ee4419b68f178d20090d26417fb2e38001..0c4db8bb1e0b1ba24097cc4fa92a02610085945d 100644 (file)
--- a/ext/posix/posix.c
+++ b/ext/posix/posix.c
@@ -892,7 +892,7 @@ PHP_FUNCTION(posix_mknod)
 #if defined(HAVE_MAKEDEV) || defined(makedev)
                        php_dev = makedev(major, minor);
 #else
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Can not create a block or character device, creating a normal file instead");
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot create a block or character device, creating a normal file instead");
 #endif
                }
        }

diff --git a/ext/shmop/shmop.c b/ext/shmop/shmop.c
index e753697685fc4060bbff086d6b7afcf4dab0b2b3..4e53927fccf160e1683e5d688a7e6349f0adb1ba 100644 (file)
--- a/ext/shmop/shmop.c
+++ b/ext/shmop/shmop.c
@@ -203,7 +203,7 @@ PHP_FUNCTION(shmop_open)
        }
 
        if (shmop->shmflg & IPC_CREAT && shmop->size < 1) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Shared memory segment size must be greater then zero.");
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Shared memory segment size must be greater than zero");
                goto err;
        }
 

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index fcf45d06027c3cd990c6b1f7bbc7af5386e8e8ff..56c8695f3e225e9bc2ef7da23ae0fa673ba0bcfd 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -5917,7 +5917,7 @@ PHP_FUNCTION(parse_ini_file)
        }
 
        if (filename_len == 0) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Filename can not be empty!");
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Filename cannot be empty!");
                RETURN_FALSE;
        }
 

diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c
index 24cd618f5ee343c5fe55106d14554f497389e4b7..61857e59c9a897a586e6a39a9f67b21a0273b38c 100644 (file)
--- a/ext/standard/browscap.c
+++ b/ext/standard/browscap.c
@@ -122,7 +122,7 @@ static void php_browscap_parser_cb(zval *arg1, zval *arg2, zval *arg3, int callb
                                        current_section_name != NULL &&
                                        !strcasecmp(current_section_name, Z_STRVAL_P(arg2))
                                ) {
-                                       zend_error(E_CORE_ERROR, "Invalid browscap ini file: 'Parent' value can not be same as the section name: %s (in file %s)", current_section_name, INI_STR("browscap"));
+                                       zend_error(E_CORE_ERROR, "Invalid browscap ini file: 'Parent' value cannot be same as the section name: %s (in file %s)", current_section_name, INI_STR("browscap"));
                                        return;
                                }
 

diff --git a/ext/standard/head.c b/ext/standard/head.c
index 67b145971840fa2a13e74567f1499f618cbea360..c0a7314df88587f09c47cc53d2bf286f8091c487 100644 (file)
--- a/ext/standard/head.c
+++ b/ext/standard/head.c
@@ -83,12 +83,12 @@ PHPAPI int php_setcookie(char *name, int name_len, char *value, int value_len, t
        int result;
        
        if (name && strpbrk(name, "=,; \t\r\n\013\014") != NULL) {   /* man isspace for \013 and \014 */
-               zend_error( E_WARNING, "Cookie names can not contain any of the following '=,; \\t\\r\\n\\013\\014'" );
+               zend_error( E_WARNING, "Cookie names cannot contain any of the following '=,; \\t\\r\\n\\013\\014'" );
                return FAILURE;
        }
 
        if (!url_encode && value && strpbrk(value, ",; \t\r\n\013\014") != NULL) { /* man isspace for \013 and \014 */
-               zend_error( E_WARNING, "Cookie values can not contain any of the following ',; \\t\\r\\n\\013\\014'" );
+               zend_error( E_WARNING, "Cookie values cannot contain any of the following ',; \\t\\r\\n\\013\\014'" );
                return FAILURE;
        }
 

diff --git a/ext/standard/tests/file/parse_ini_file_variation4.phpt b/ext/standard/tests/file/parse_ini_file_variation4.phpt
index 55bc22f96977b4ee2c5bfac034e3019433597a89..46d45af48e9a2051788c2f68721f1b2649acfd01 100644 (file)
--- a/ext/standard/tests/file/parse_ini_file_variation4.phpt
+++ b/ext/standard/tests/file/parse_ini_file_variation4.phpt
@@ -161,11 +161,11 @@ Error: 2 - parse_ini_file() expects parameter 1 to be string, array given, %s(%d
 bool(false)
 
 --uppercase NULL--
-Error: 2 - parse_ini_file(): Filename can not be empty!, %s(%d)
+Error: 2 - parse_ini_file(): Filename cannot be empty!, %s(%d)
 bool(false)
 
 --lowercase null--
-Error: 2 - parse_ini_file(): Filename can not be empty!, %s(%d)
+Error: 2 - parse_ini_file(): Filename cannot be empty!, %s(%d)
 bool(false)
 
 --lowercase true--
@@ -173,7 +173,7 @@ Error: 2 - parse_ini_file(1): failed to open stream: No such file or directory,
 bool(false)
 
 --lowercase false--
-Error: 2 - parse_ini_file(): Filename can not be empty!, %s(%d)
+Error: 2 - parse_ini_file(): Filename cannot be empty!, %s(%d)
 bool(false)
 
 --uppercase TRUE--
@@ -181,15 +181,15 @@ Error: 2 - parse_ini_file(1): failed to open stream: No such file or directory,
 bool(false)
 
 --uppercase FALSE--
-Error: 2 - parse_ini_file(): Filename can not be empty!, %s(%d)
+Error: 2 - parse_ini_file(): Filename cannot be empty!, %s(%d)
 bool(false)
 
 --empty string DQ--
-Error: 2 - parse_ini_file(): Filename can not be empty!, %s(%d)
+Error: 2 - parse_ini_file(): Filename cannot be empty!, %s(%d)
 bool(false)
 
 --empty string SQ--
-Error: 2 - parse_ini_file(): Filename can not be empty!, %s(%d)
+Error: 2 - parse_ini_file(): Filename cannot be empty!, %s(%d)
 bool(false)
 
 --instance of classWithToString--
@@ -201,11 +201,11 @@ Error: 2 - parse_ini_file() expects parameter 1 to be string, object given, %s(%
 bool(false)
 
 --undefined var--
-Error: 2 - parse_ini_file(): Filename can not be empty!, %s(%d)
+Error: 2 - parse_ini_file(): Filename cannot be empty!, %s(%d)
 bool(false)
 
 --unset var--
-Error: 2 - parse_ini_file(): Filename can not be empty!, %s(%d)
+Error: 2 - parse_ini_file(): Filename cannot be empty!, %s(%d)
 bool(false)
 ===DONE===
 

diff --git a/ext/sysvshm/sysvshm.c b/ext/sysvshm/sysvshm.c
index 7eee61a51015fecb907f87fbf6b4ee1fc972e1c9..0cf542d2450e8cfdd6b59765fea857815dbc32c3 100644 (file)
--- a/ext/sysvshm/sysvshm.c
+++ b/ext/sysvshm/sysvshm.c
@@ -157,7 +157,7 @@ PHP_FUNCTION(shm_attach)
        }
 
        if (shm_size < 1) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Segment size must be greater then zero.");
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Segment size must be greater than zero");
                RETURN_FALSE;
        }
 

diff --git a/ext/sysvshm/tests/002.phpt b/ext/sysvshm/tests/002.phpt
index 958bd4c316cc052f88315030a3d7f17cc514edfe..61174c6b8398cd179c8125ddb0216e8857d83d50 100644 (file)
--- a/ext/sysvshm/tests/002.phpt
+++ b/ext/sysvshm/tests/002.phpt
@@ -39,21 +39,21 @@ NULL
 Warning: shm_attach() expects at most 3 parameters, 4 given in %s on line %d
 NULL
 
-Warning: shm_attach(): Segment size must be greater then zero. in %s on line %d
+Warning: shm_attach(): Segment size must be greater than zero in %s on line %d
 bool(false)
 
-Warning: shm_attach(): Segment size must be greater then zero. in %s on line %d
+Warning: shm_attach(): Segment size must be greater than zero in %s on line %d
 bool(false)
 
-Warning: shm_attach(): Segment size must be greater then zero. in %s on line %d
+Warning: shm_attach(): Segment size must be greater than zero in %s on line %d
 bool(false)
 
-Warning: shm_attach(): Segment size must be greater then zero. in %s on line %d
+Warning: shm_attach(): Segment size must be greater than zero in %s on line %d
 bool(false)
 
 Warning: shm_remove() expects parameter 1 to be resource, boolean given in %s on line %d
 
-Warning: shm_attach(): Segment size must be greater then zero. in %s on line %d
+Warning: shm_attach(): Segment size must be greater than zero in %s on line %d
 bool(false)
 
 Warning: shm_remove() expects parameter 1 to be resource, boolean given in %s on line %d

diff --git a/ext/xsl/tests/xslt011.phpt b/ext/xsl/tests/xslt011.phpt
index 8cf99e416a2256911f7b7d1edb461355df7d20cf..efa2dd755061f693f3389bb7f839d6b16eafb731 100644 (file)
--- a/ext/xsl/tests/xslt011.phpt
+++ b/ext/xsl/tests/xslt011.phpt
@@ -49,7 +49,7 @@ $dom = new domDocument();
 --EXPECTF--
 Test 11: php:function Support
 
-Warning: XSLTProcessor::transformToXml(): A PHP Object can not be converted to a XPath-string in %s on line 16
+Warning: XSLTProcessor::transformToXml(): A PHP Object cannot be converted to a XPath-string in %s on line 16
 <?xml version="1.0"?>
 foobar - secondArg
 foobar - 

diff --git a/ext/xsl/xsltprocessor.c b/ext/xsl/xsltprocessor.c
index ef925fc7e732ca904b50826288389b5177ec10b8..d1108e5122c7f37b7c9248676042324646aa7e67 100644 (file)
--- a/ext/xsl/xsltprocessor.c
+++ b/ext/xsl/xsltprocessor.c
@@ -343,7 +343,7 @@ static void xsl_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs, int t
                        } else if (retval->type == IS_BOOL) {
                                valuePush(ctxt, xmlXPathNewBoolean(retval->value.lval));
                        } else if (retval->type == IS_OBJECT) {
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "A PHP Object can not be converted to a XPath-string");
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "A PHP Object cannot be converted to a XPath-string");
                                valuePush(ctxt, xmlXPathNewString(""));
                        } else {
                                convert_to_string_ex(&retval);