summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ext/dom/xpath.c2
-rw-r--r--ext/imap/php_imap.c2
-rw-r--r--ext/mcrypt/mcrypt.c2
-rw-r--r--ext/odbc/birdstep.c2
-rw-r--r--ext/posix/posix.c2
-rw-r--r--ext/shmop/shmop.c2
-rw-r--r--ext/standard/basic_functions.c2
-rw-r--r--ext/standard/browscap.c2
-rw-r--r--ext/standard/head.c4
-rw-r--r--ext/standard/tests/file/parse_ini_file_variation4.phpt16
-rw-r--r--ext/sysvshm/sysvshm.c2
-rw-r--r--ext/sysvshm/tests/002.phpt10
-rw-r--r--ext/xsl/tests/xslt011.phpt2
-rw-r--r--ext/xsl/xsltprocessor.c2
14 files changed, 26 insertions, 26 deletions
diff --git a/ext/dom/xpath.c b/ext/dom/xpath.c
index 167a744dc7..b8e3388eaa 100644
--- 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 668b5270e0..7883c2e2c5 100644
--- 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 5164a585f7..1a5646eac1 100644
--- 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 83c8c87076..fa76ab97fd 100644
--- 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 786782ee44..0c4db8bb1e 100644
--- 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 e753697685..4e53927fcc 100644
--- 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 fcf45d0602..56c8695f3e 100644
--- 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 24cd618f5e..61857e59c9 100644
--- 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 67b1459718..c0a7314df8 100644
--- 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 55bc22f969..46d45af48e 100644
--- 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 7eee61a510..0cf542d245 100644
--- 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 958bd4c316..61174c6b83 100644
--- 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 8cf99e416a..efa2dd7550 100644
--- 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 ef925fc7e7..d1108e5122 100644
--- 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);
View Lorry Controller Status