Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Closed
wants to merge 1 commit into from
Closed

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Zend/ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15560,7 +15560,7 @@
is usually the NULL pointer).

* zend_constants.c:
Fix a memory leak which occured upon registering an already existing
Fix a memory leak which occurred upon registering an already existing
constant.

2001-05-11 Thies C. Arntzen <thies@thieso.net>
Expand Down Expand Up @@ -21119,7 +21119,7 @@

* zend_compile.c: Two fixes:
* The error generated by a failed class inheritence wasn't properly
displaying the file in which he error occured.
displaying the file in which he error occurred.
* Inheritence didn't work if the parent class had uppercase letters in it.

* zend-parser.y
Expand Down Expand Up @@ -21491,7 +21491,7 @@
zend_compile.c
zend_globals.h
zend_highlight.c:
* Fix a bug that occured in case of parse errors. We need to restore the lexical state
* Fix a bug that occurred in case of parse errors. We need to restore the lexical state
even if the compilation failed.

1999-05-10 Zeev Suraski <zeev@zend.com>
Expand Down
14 changes: 7 additions & 7 deletions Zend/tests/bug39018.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
8 changes: 4 additions & 4 deletions Zend/tests/offset_string.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Zend/zend_compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions Zend/zend_execute.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ext/dom/xpath.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
2 changes: 1 addition & 1 deletion ext/imap/tests/imap_errors_basic.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/

Expand Down
4 changes: 2 additions & 2 deletions ext/intl/common/common_error.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
{
Expand All @@ -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 )
{
Expand Down
8 changes: 4 additions & 4 deletions ext/intl/doc/collator_api.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {}
Expand Down Expand Up @@ -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 ) {}
Expand Down Expand Up @@ -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 ) {}
Expand Down Expand Up @@ -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 ) {}
4 changes: 2 additions & 2 deletions ext/intl/doc/common_api.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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() {}
Expand Down
4 changes: 2 additions & 2 deletions ext/intl/doc/datefmt_api.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {}
Expand Down Expand Up @@ -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) {}
Expand Down
4 changes: 2 additions & 2 deletions ext/intl/doc/formatter_api.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {}

Expand Down Expand Up @@ -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) {}
4 changes: 2 additions & 2 deletions ext/intl/doc/msgfmt_api.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {}

Expand Down Expand Up @@ -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) {}

Expand Down
4 changes: 2 additions & 2 deletions ext/intl/intl_convert.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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).
*/
Expand Down Expand Up @@ -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).
*/
Expand Down
6 changes: 3 additions & 3 deletions ext/intl/normalizer/normalizer_normalize.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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).
*/
Expand All @@ -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 );
Expand Down Expand Up @@ -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 );
Expand Down
2 changes: 1 addition & 1 deletion ext/intl/tests/formatter_get_error.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' );
Expand Down
2 changes: 1 addition & 1 deletion ext/mysqli/mysqli.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down
2 changes: 1 addition & 1 deletion ext/mysqli/tests/mysqli_stmt_affected_rows.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions ext/mysqlnd/mysqlnd_loaddata.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand All @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions ext/pcntl/pcntl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand All @@ -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));
}
}

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
Loading