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 ad2ced8ba97ef8557e5d90b41715e77ece85e66b..ffea84fcfdae269509d70a06335767eee656b4d8 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_with_converter(retval, UG(utf8_conv));

diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index 2fac2276826054031117195fda3e9d68665bf687..c499c1da070711e56f22653b3b17ff31a85c9835 100644 (file)
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -3726,7 +3726,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 52810b0a7ea98dbacf4284f5b61c7d363429a0aa..9a3234ace3ba57690e44804b7ccadffa5d01c5bf 100644 (file)
--- a/ext/mcrypt/mcrypt.c
+++ b/ext/mcrypt/mcrypt.c
@@ -1169,7 +1169,7 @@ PHP_FUNCTION(mcrypt_create_iv)
 int php_mcrypt_iv(php_mcrypt_iv_source source, int size, char **iv_str, int *iv_len TSRMLS_DC)
 {
        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 FAILURE;
        }
        

diff --git a/ext/odbc/birdstep.c b/ext/odbc/birdstep.c
index c3e1a6eaf9c81d29196531665fa7a4d5b6f493ee..139666887a3ed27eb8c29f715d6ac7e15f63dac1 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 be399961f44e6fb32ae15635c2dd923de39c13d5..40f9b6297a4eb2b687b06c64d45082bffb6fea00 100644 (file)
--- a/ext/posix/posix.c
+++ b/ext/posix/posix.c
@@ -886,7 +886,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 51567930ec8da8328ee7e06a441659dfc38dbc66..5c78f916c79503a3bf01073676b94a515ef82bf3 100644 (file)
--- a/ext/shmop/shmop.c
+++ b/ext/shmop/shmop.c
@@ -215,7 +215,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 156fda847aa021f2c3a0cc2ec99b7ec8f13077d8..9250d44b0310ea9fadd5e77109c0df4907639b40 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -6036,7 +6036,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 8dc911b435d43ed49a3cc4b3360ea3c973a4c2c2..e6c97afa2d19db5c32680c5b96bb76ff3199dba4 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 c0831bfd12d93e8fa6a0eeb4a310fb08d3ad5771..bbbb31890c22eaea16d813d78eac96eb9258a046 100644 (file)
--- a/ext/standard/head.c
+++ b/ext/standard/head.c
@@ -84,12 +84,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 0032c6a2d4d0da0cc2dc50cd57a0de7d1c75c314..5ff708e3a4eb43f1d5c0630cc4a221e21fb961e8 100644 (file)
--- a/ext/standard/tests/file/parse_ini_file_variation4.phpt
+++ b/ext/standard/tests/file/parse_ini_file_variation4.phpt
@@ -165,11 +165,11 @@ Error: 2 - parse_ini_file(Array): failed to open stream: No such file or directo
 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--
@@ -177,7 +177,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--
@@ -185,15 +185,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--
@@ -207,11 +207,11 @@ Error: 2 - parse_ini_file(Object): failed to open stream: No such file or direct
 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 9f62086e3a3ab924a830dfcd02b5cafd438036a2..bf9e773e0c61e6e1d1e249539a69369772231ce7 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 9f1502702eaae983cb718d0e0b5107f0703609a7..d035a409ecfdbe1df882fbcff61ecb038025e6aa 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 00e07699d7c304e38d61095f6885514160aa491b..da57eae0412b97e3a68a2457e667661a4849905d 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 c5085d9f676feefd757a2962cb5397872b149f6f..a16359430903f3aa2985eb3a7ffefe13eeb28014 100644 (file)
--- a/ext/xsl/xsltprocessor.c
+++ b/ext/xsl/xsltprocessor.c
@@ -344,7 +344,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_with_converter(retval, UG(utf8_conv));