Permalink
Browse files

Fixed the common misspelling of the word occurred (occured -> occurred)

  • Loading branch information...
1 parent b8d453d commit 896ac689c91967dec0601fa9fe048c518da52a3c @Easen Easen committed with smalyshev Jun 11, 2012
View
@@ -62,17 +62,17 @@ print "\nDone\n";
?>
--EXPECTF--
-Notice: String offset cast occured in %s on line %d
+Notice: String offset cast occurred in %s on line %d
Notice: Uninitialized string offset: 0 in %s on line %d
Notice: Uninitialized string offset: 0 in %s on line %d
-Notice: String offset cast occured in %s on line %d
+Notice: String offset cast occurred in %s on line %d
Notice: Uninitialized string offset: %i in %s on line %d
-Notice: String offset cast occured in %s on line %d
+Notice: String offset cast occurred in %s on line %d
Notice: Uninitialized string offset: %i in %s on line %d
@@ -88,16 +88,16 @@ Notice: Uninitialized string offset: 4 in %s on line %d
Notice: Uninitialized string offset: 4 in %s on line %d
-Notice: String offset cast occured in %s on line %d
+Notice: String offset cast occurred in %s on line %d
Notice: Uninitialized string offset: 12 in %s on line %d
-Notice: String offset cast occured in %s on line %d
+Notice: String offset cast occurred in %s on line %d
Notice: Uninitialized string offset: 12 in %s on line %d
-Notice: String offset cast occured in %s on line %d
+Notice: String offset cast occurred in %s on line %d
-Notice: String offset cast occured in %s on line %d
+Notice: String offset cast occurred in %s on line %d
b
Done
@@ -30,10 +30,10 @@ echo "Done\n";
--EXPECTF--
string(1) "i"
-Notice: String offset cast occured in %s on line %d
+Notice: String offset cast occurred in %s on line %d
string(1) "S"
-Notice: String offset cast occured in %s on line %d
+Notice: String offset cast occurred in %s on line %d
string(1) "S"
Warning: Illegal string offset 'run away' in %s on line %d
@@ -46,10 +46,10 @@ string(1) "o"
Notice: A non well formed numeric value encountered in %s on line %d
string(1) "r"
-Notice: String offset cast occured in %s on line %d
+Notice: String offset cast occurred in %s on line %d
string(1) "i"
-Notice: String offset cast occured in %s on line %d
+Notice: String offset cast occurred in %s on line %d
string(1) "S"
Warning: Illegal offset type in %s on line %d
View
@@ -3712,7 +3712,7 @@ static int zend_traits_merge_functions(zend_function *fn TSRMLS_DC, int num_args
} else {
/* Add it to result function table */
if (zend_hash_quick_add(resulting_table, hash_key->arKey, hash_key->nKeyLength, hash_key->h, fn, sizeof(zend_function), NULL)==FAILURE) {
- zend_error(E_COMPILE_ERROR, "Trait method %s has not been applied, because failure occured during updating resulting trait method table", fn->common.function_name);
+ zend_error(E_COMPILE_ERROR, "Trait method %s has not been applied, because failure occurred during updating resulting trait method table", fn->common.function_name);
}
}
@@ -3829,7 +3829,7 @@ static int zend_traits_merge_functions_to_class(zend_function *fn TSRMLS_DC, int
function_add_ref(&fn_copy);
if (zend_hash_quick_update(&ce->function_table, hash_key->arKey, hash_key->nKeyLength, hash_key->h, &fn_copy, sizeof(zend_function), (void**)&fn_copy_p)==FAILURE) {
- zend_error(E_COMPILE_ERROR, "Trait method %s has not been applied, because failure occured during updating class method table", hash_key->arKey);
+ zend_error(E_COMPILE_ERROR, "Trait method %s has not been applied, because failure occurred during updating class method table", hash_key->arKey);
}
zend_add_magic_methods(ce, hash_key->arKey, hash_key->nKeyLength, fn_copy_p TSRMLS_CC);
View
@@ -1161,7 +1161,7 @@ static void zend_fetch_dimension_address(temp_variable *result, zval **container
case IS_DOUBLE:
case IS_NULL:
case IS_BOOL:
- zend_error(E_NOTICE, "String offset cast occured");
+ zend_error(E_NOTICE, "String offset cast occurred");
break;
default:
zend_error(E_WARNING, "Illegal offset type");
@@ -1284,7 +1284,7 @@ static void zend_fetch_dimension_address_read(temp_variable *result, zval **cont
case IS_NULL:
case IS_BOOL:
if (type != BP_VAR_IS) {
- zend_error(E_NOTICE, "String offset cast occured");
+ zend_error(E_NOTICE, "String offset cast occurred");
}
break;
default:
View
@@ -216,7 +216,7 @@ static void dom_xpath_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs,
if (Z_TYPE(handler) == IS_STRING) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to call handler %s()", Z_STRVAL_P(&handler));
}
- /* retval is == NULL, when an exception occured, don't report anything, because PHP itself will handle that */
+ /* retval is == NULL, when an exception occurred, don't report anything, because PHP itself will handle that */
} else if (retval == NULL) {
} else {
if (retval->type == IS_OBJECT && instanceof_function( Z_OBJCE_P(retval), dom_node_class_entry TSRMLS_CC)) {
@@ -7,7 +7,7 @@ require_once(dirname(__FILE__).'/skipif.inc');
--FILE--
<?php
/* Prototype : array imap_errors ( void )
- * Description: Returns all of the IMAP errors that have occured.
+ * Description: Returns all of the IMAP errors that have occurred.
* Source code: ext/imap/php_imap.c
*/
@@ -24,7 +24,7 @@
#include "common_error.h"
/* {{{ proto int intl_get_error_code()
- * Get code of the last occured error.
+ * Get code of the last occurred error.
*/
PHP_FUNCTION( intl_get_error_code )
{
@@ -33,7 +33,7 @@ PHP_FUNCTION( intl_get_error_code )
/* }}} */
/* {{{ proto string intl_get_error_message()
- * Get text description of the last occured error.
+ * Get text description of the last occurred error.
*/
PHP_FUNCTION( intl_get_error_message )
{
@@ -116,7 +116,7 @@ public function getErrorCode() {}
/**
* Return error text for the last ICU operation.
*
- * @return string Description of an error occured in the last
+ * @return string Description of an error occurred in the last
* Collator method call.
*/
public function getErrorMessage() {}
@@ -236,7 +236,7 @@ public function setStrength( $strength ) {}
*
* @return string Real locale name from which the
* collation data comes. If the collator
- * was instantiated from rules or an error occured,
+ * was instantiated from rules or an error occurred,
* returns false.
*/
public function getLocale( $type ) {}
@@ -331,7 +331,7 @@ function collator_sort_with_sort_keys( $coll, $arr ) {}
*
* @return string Real locale name from which the
* collation data comes. If the collator
- * was instantiated from rules or an error occured,
+ * was instantiated from rules or an error occurred,
* returns false.
*/
function collator_get_locale( $coll, $type ) {}
@@ -391,7 +391,7 @@ function collator_get_error_code( $coll ) {}
*
* @param Collator $coll Collator object.
*
- * @return string Description of an error occured in the last
+ * @return string Description of an error occurred in the last
* Collator API function call.
*/
function collator_get_error_message( $coll ) {}
@@ -1,7 +1,7 @@
<?php
/**
- * Handling of errors occured in static methods
+ * Handling of errors occurred in static methods
* when there's no object to get error code/message from.
*
* Example #1:
@@ -29,7 +29,7 @@ function intl_get_error_code() {}
/**
* Get description of the last error.
*
- * @return string Description of an error occured in the last
+ * @return string Description of an error occurred in the last
* API function call.
*/
function intl_get_error_message() {}
@@ -215,7 +215,7 @@ public function getPattern() {}
/**
* Sets the pattern to use
* @param string $pattern new pattern string to use
- * @return boolean 'true' if successful, 'false' if an error occured. Bad format
+ * @return boolean 'true' if successful, 'false' if an error occurred. Bad format
* strings are usually the cause of the latter.
*/
public function setPattern($pattern) {}
@@ -410,7 +410,7 @@ function datefmt_get_pattern($fmt) {}
* Sets the pattern to use
* @param DateFormatter $fmt The date formatter resource
* @param string $pattern new pattern string to use
- * @return boolean 'true' if successful, 'false' if an error occured. Bad format
+ * @return boolean 'true' if successful, 'false' if an error occurred. Bad format
* strings are usually the cause of the latter.
*/
function datefmt_set_pattern($fmt , $pattern) {}
@@ -317,7 +317,7 @@ public function getErrorCode() {}
/**
* Get the error text from the last operation.
*
- * @return string Description of the last occured error.
+ * @return string Description of the last occurred error.
*/
public public function getErrorMessage() {}
@@ -495,6 +495,6 @@ function numfmt_get_error_code($formatter) {}
* Get the error text from the last operation.
*
* @param NumberFormatter $formatter The formatter resource
- * @return string Description of the last occured error.
+ * @return string Description of the last occurred error.
*/
function numfmt_get_error_message($formatter) {}
@@ -54,7 +54,7 @@ public function parse($value) {}
* @param string $locale the locale to use when formatting numbers and dates and suchlike
* @param string $pattern the pattern string to insert things into
* @param array $args the array of values to insert into $pattern
- * @return string the formatted pattern string or false if an error occured
+ * @return string the formatted pattern string or false if an error occurred
*/
public static function formatMessage($locale, $pattern, $args) {}
@@ -148,7 +148,7 @@ function msgfmt_parse($fmt, $value) {}
* @param string $locale the locale to use when formatting numbers and dates and suchlike
* @param string $pattern the pattern string to insert things into
* @param array $args the array of values to insert into $pattern
- * @return string the formatted pattern string or false if an error occured
+ * @return string the formatted pattern string or false if an error occurred
*/
function msgfmt_format_message($locale, $pattern, $args) {}
View
@@ -67,7 +67,7 @@ void intl_convert_utf8_to_utf16(
return;
}
- /* Bail out if an unexpected error occured.
+ /* Bail out if an unexpected error occurred.
* (U_BUFFER_OVERFLOW_ERROR means that *target buffer is not large enough).
* (U_STRING_NOT_TERMINATED_WARNING usually means that the input string is empty).
*/
@@ -119,7 +119,7 @@ void intl_convert_utf16_to_utf8(
*status = U_ZERO_ERROR;
u_strToUTF8( NULL, 0, &dst_len, src, src_len, status );
- /* Bail out if an unexpected error occured.
+ /* Bail out if an unexpected error occurred.
* (U_BUFFER_OVERFLOW_ERROR means that *target buffer is not large enough).
* (U_STRING_NOT_TERMINATED_WARNING usually means that the input string is empty).
*/
@@ -110,7 +110,7 @@ PHP_FUNCTION( normalizer_normalize )
/* normalize */
size_needed = unorm_normalize( uinput, uinput_len, form, (int32_t) 0 /* options */, uret_buf, uret_len, &status);
- /* Bail out if an unexpected error occured.
+ /* Bail out if an unexpected error occurred.
* (U_BUFFER_OVERFLOW_ERROR means that *target buffer is not large enough).
* (U_STRING_NOT_TERMINATED_WARNING usually means that the input string is empty).
*/
@@ -133,7 +133,7 @@ PHP_FUNCTION( normalizer_normalize )
/* try normalize again */
size_needed = unorm_normalize( uinput, uinput_len, form, (int32_t) 0 /* options */, uret_buf, uret_len, &status);
- /* Bail out if an unexpected error occured. */
+ /* Bail out if an unexpected error occurred. */
if( U_FAILURE(status) ) {
/* Set error messages. */
intl_error_set_custom_msg( NULL,"Error normalizing string", 0 TSRMLS_CC );
@@ -234,7 +234,7 @@ PHP_FUNCTION( normalizer_is_normalized )
efree( uinput );
- /* Bail out if an unexpected error occured. */
+ /* Bail out if an unexpected error occurred. */
if( U_FAILURE(status) ) {
/* Set error messages. */
intl_error_set_custom_msg( NULL,"Error testing if string is the given normalization form.", 0 TSRMLS_CC );
@@ -19,7 +19,7 @@ function ut_main()
if( $num === false )
return $fmt->getErrorMessage() . " (" . $fmt->getErrorCode() . ")\n";
else
- return "Ooops, an error should have occured.";
+ return "Ooops, an error should have occurred.";
}
include_once( 'ut_common.inc' );
View
@@ -162,7 +162,7 @@ void php_clear_stmt_bind(MY_STMT *stmt TSRMLS_DC)
{
if (stmt->stmt) {
if (mysqli_stmt_close(stmt->stmt, TRUE)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error occured while closing statement");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error occurred while closing statement");
return;
}
}
@@ -63,7 +63,7 @@ require_once('skipifconnectfailure.inc');
// NOTE: the error message varies with the MySQL Server version, dump only the error code!
printf("[009] [%d] (error message varies with the MySQL Server version, check the error code)\n", mysqli_stmt_errno($stmt));
- /* an error occured: affected rows should return -1 */
+ /* an error occurred: affected rows should return -1 */
if (-1 !== ($tmp = mysqli_stmt_affected_rows($stmt)))
printf("[010] Expecting int/0, got %s/%s\n", gettype($tmp), $tmp);
@@ -188,7 +188,7 @@ mysqlnd_handle_local_infile(MYSQLND_CONN_DATA * conn, const char * filename, zen
char tmp_buf[sizeof(conn->error_info->error)];
int tmp_error_no;
*is_warning = TRUE;
- /* error occured */
+ /* error occurred */
tmp_error_no = infile.local_infile_error(info, tmp_buf, sizeof(tmp_buf) TSRMLS_CC);
SET_CLIENT_ERROR(*conn->error_info, tmp_error_no, UNKNOWN_SQLSTATE, tmp_buf);
/* write empty packet to server */
@@ -211,7 +211,7 @@ mysqlnd_handle_local_infile(MYSQLND_CONN_DATA * conn, const char * filename, zen
goto infile_error;
}
- /* error during read occured */
+ /* error during read occurred */
if (bufsize < 0) {
char tmp_buf[sizeof(conn->error_info->error)];
int tmp_error_no;
View
@@ -816,7 +816,7 @@ PHP_FUNCTION(pcntl_exec)
if (execve(path, argv, envp) == -1) {
PCNTL_G(last_error) = errno;
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error has occured: (errno %d) %s", errno, strerror(errno));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error has occurred: (errno %d) %s", errno, strerror(errno));
}
/* Cleanup */
@@ -826,7 +826,7 @@ PHP_FUNCTION(pcntl_exec)
if (execv(path, argv) == -1) {
PCNTL_G(last_error) = errno;
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error has occured: (errno %d) %s", errno, strerror(errno));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error has occurred: (errno %d) %s", errno, strerror(errno));
}
}
@@ -1127,7 +1127,7 @@ PHP_FUNCTION(pcntl_getpriority)
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error %d: Invalid identifier flag", errno);
break;
default:
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown error %d has occured", errno);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown error %d has occurred", errno);
break;
}
RETURN_FALSE;
@@ -1167,7 +1167,7 @@ PHP_FUNCTION(pcntl_setpriority)
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error %d: Only a super user may attempt to increase the process priority", errno);
break;
default:
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown error %d has occured", errno);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown error %d has occurred", errno);
break;
}
RETURN_FALSE;
@@ -13,5 +13,5 @@ unlink($file);
Warning: pcntl_exec() expects at least 1 parameter, 0 given %s
NULL
-Warning: pcntl_exec(): Error has occured: (errno %d) %s
+Warning: pcntl_exec(): Error has occurred: (errno %d) %s
bool(false)
@@ -134,7 +134,7 @@ static int pdo_mysql_fill_stmt_from_result(pdo_stmt_t *stmt TSRMLS_DC) /* {{{ */
row_count = mysql_affected_rows(H->server);
if (row_count == (my_ulonglong)-1) {
- /* we either have a query that returned a result set or an error occured
+ /* we either have a query that returned a result set or an error occurred
lets see if we have access to a result set */
if (!H->buffered) {
S->result = mysql_use_result(H->server);
@@ -10,7 +10,7 @@ $sxe = simplexml_load_string('<root><node1>1</node1></root>');
$nodes = $sxe->xpath("/root/node2/@test");
if (! is_array($nodes)) {
- echo "An error occured\n";
+ echo "An error occurred\n";
} else {
echo "Result Count: " . count($nodes) . "\n";
}
Oops, something went wrong.

0 comments on commit 896ac68

Please sign in to comment.