Skip to content

Commit 896ac68

Browse files
Easensmalyshev
Easen
authored and
smalyshev
committed
Fixed the common misspelling of the word occurred (occured -> occurred)
1 parent b8d453d commit 896ac68

34 files changed

+73
-73
lines changed

Diff for: ‎Zend/tests/bug39018.phpt

+7-7
Original file line numberDiff line numberDiff line change
@@ -62,17 +62,17 @@ print "\nDone\n";
6262

6363
?>
6464
--EXPECTF--
65-
Notice: String offset cast occured in %s on line %d
65+
Notice: String offset cast occurred in %s on line %d
6666

6767
Notice: Uninitialized string offset: 0 in %s on line %d
6868

6969
Notice: Uninitialized string offset: 0 in %s on line %d
7070

71-
Notice: String offset cast occured in %s on line %d
71+
Notice: String offset cast occurred in %s on line %d
7272

7373
Notice: Uninitialized string offset: %i in %s on line %d
7474

75-
Notice: String offset cast occured in %s on line %d
75+
Notice: String offset cast occurred in %s on line %d
7676

7777
Notice: Uninitialized string offset: %i in %s on line %d
7878

@@ -88,16 +88,16 @@ Notice: Uninitialized string offset: 4 in %s on line %d
8888

8989
Notice: Uninitialized string offset: 4 in %s on line %d
9090

91-
Notice: String offset cast occured in %s on line %d
91+
Notice: String offset cast occurred in %s on line %d
9292

9393
Notice: Uninitialized string offset: 12 in %s on line %d
9494

95-
Notice: String offset cast occured in %s on line %d
95+
Notice: String offset cast occurred in %s on line %d
9696

9797
Notice: Uninitialized string offset: 12 in %s on line %d
9898

99-
Notice: String offset cast occured in %s on line %d
99+
Notice: String offset cast occurred in %s on line %d
100100

101-
Notice: String offset cast occured in %s on line %d
101+
Notice: String offset cast occurred in %s on line %d
102102
b
103103
Done

Diff for: ‎Zend/tests/offset_string.phpt

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ echo "Done\n";
3030
--EXPECTF--
3131
string(1) "i"
3232

33-
Notice: String offset cast occured in %s on line %d
33+
Notice: String offset cast occurred in %s on line %d
3434
string(1) "S"
3535

36-
Notice: String offset cast occured in %s on line %d
36+
Notice: String offset cast occurred in %s on line %d
3737
string(1) "S"
3838

3939
Warning: Illegal string offset 'run away' in %s on line %d
@@ -46,10 +46,10 @@ string(1) "o"
4646
Notice: A non well formed numeric value encountered in %s on line %d
4747
string(1) "r"
4848

49-
Notice: String offset cast occured in %s on line %d
49+
Notice: String offset cast occurred in %s on line %d
5050
string(1) "i"
5151

52-
Notice: String offset cast occured in %s on line %d
52+
Notice: String offset cast occurred in %s on line %d
5353
string(1) "S"
5454

5555
Warning: Illegal offset type in %s on line %d

Diff for: ‎Zend/zend_compile.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -3712,7 +3712,7 @@ static int zend_traits_merge_functions(zend_function *fn TSRMLS_DC, int num_args
37123712
} else {
37133713
/* Add it to result function table */
37143714
if (zend_hash_quick_add(resulting_table, hash_key->arKey, hash_key->nKeyLength, hash_key->h, fn, sizeof(zend_function), NULL)==FAILURE) {
3715-
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);
3715+
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);
37163716
}
37173717
}
37183718

@@ -3829,7 +3829,7 @@ static int zend_traits_merge_functions_to_class(zend_function *fn TSRMLS_DC, int
38293829
function_add_ref(&fn_copy);
38303830

38313831
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) {
3832-
zend_error(E_COMPILE_ERROR, "Trait method %s has not been applied, because failure occured during updating class method table", hash_key->arKey);
3832+
zend_error(E_COMPILE_ERROR, "Trait method %s has not been applied, because failure occurred during updating class method table", hash_key->arKey);
38333833
}
38343834

38353835
zend_add_magic_methods(ce, hash_key->arKey, hash_key->nKeyLength, fn_copy_p TSRMLS_CC);

Diff for: ‎Zend/zend_execute.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1161,7 +1161,7 @@ static void zend_fetch_dimension_address(temp_variable *result, zval **container
11611161
case IS_DOUBLE:
11621162
case IS_NULL:
11631163
case IS_BOOL:
1164-
zend_error(E_NOTICE, "String offset cast occured");
1164+
zend_error(E_NOTICE, "String offset cast occurred");
11651165
break;
11661166
default:
11671167
zend_error(E_WARNING, "Illegal offset type");
@@ -1284,7 +1284,7 @@ static void zend_fetch_dimension_address_read(temp_variable *result, zval **cont
12841284
case IS_NULL:
12851285
case IS_BOOL:
12861286
if (type != BP_VAR_IS) {
1287-
zend_error(E_NOTICE, "String offset cast occured");
1287+
zend_error(E_NOTICE, "String offset cast occurred");
12881288
}
12891289
break;
12901290
default:

Diff for: ‎ext/dom/xpath.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ static void dom_xpath_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs,
216216
if (Z_TYPE(handler) == IS_STRING) {
217217
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to call handler %s()", Z_STRVAL_P(&handler));
218218
}
219-
/* retval is == NULL, when an exception occured, don't report anything, because PHP itself will handle that */
219+
/* retval is == NULL, when an exception occurred, don't report anything, because PHP itself will handle that */
220220
} else if (retval == NULL) {
221221
} else {
222222
if (retval->type == IS_OBJECT && instanceof_function( Z_OBJCE_P(retval), dom_node_class_entry TSRMLS_CC)) {

Diff for: ‎ext/imap/tests/imap_errors_basic.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require_once(dirname(__FILE__).'/skipif.inc');
77
--FILE--
88
<?php
99
/* Prototype : array imap_errors ( void )
10-
* Description: Returns all of the IMAP errors that have occured.
10+
* Description: Returns all of the IMAP errors that have occurred.
1111
* Source code: ext/imap/php_imap.c
1212
*/
1313

Diff for: ‎ext/intl/common/common_error.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include "common_error.h"
2525

2626
/* {{{ proto int intl_get_error_code()
27-
* Get code of the last occured error.
27+
* Get code of the last occurred error.
2828
*/
2929
PHP_FUNCTION( intl_get_error_code )
3030
{
@@ -33,7 +33,7 @@ PHP_FUNCTION( intl_get_error_code )
3333
/* }}} */
3434

3535
/* {{{ proto string intl_get_error_message()
36-
* Get text description of the last occured error.
36+
* Get text description of the last occurred error.
3737
*/
3838
PHP_FUNCTION( intl_get_error_message )
3939
{

Diff for: ‎ext/intl/doc/collator_api.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public function getErrorCode() {}
116116
/**
117117
* Return error text for the last ICU operation.
118118
*
119-
* @return string Description of an error occured in the last
119+
* @return string Description of an error occurred in the last
120120
* Collator method call.
121121
*/
122122
public function getErrorMessage() {}
@@ -236,7 +236,7 @@ public function setStrength( $strength ) {}
236236
*
237237
* @return string Real locale name from which the
238238
* collation data comes. If the collator
239-
* was instantiated from rules or an error occured,
239+
* was instantiated from rules or an error occurred,
240240
* returns false.
241241
*/
242242
public function getLocale( $type ) {}
@@ -331,7 +331,7 @@ function collator_sort_with_sort_keys( $coll, $arr ) {}
331331
*
332332
* @return string Real locale name from which the
333333
* collation data comes. If the collator
334-
* was instantiated from rules or an error occured,
334+
* was instantiated from rules or an error occurred,
335335
* returns false.
336336
*/
337337
function collator_get_locale( $coll, $type ) {}
@@ -391,7 +391,7 @@ function collator_get_error_code( $coll ) {}
391391
*
392392
* @param Collator $coll Collator object.
393393
*
394-
* @return string Description of an error occured in the last
394+
* @return string Description of an error occurred in the last
395395
* Collator API function call.
396396
*/
397397
function collator_get_error_message( $coll ) {}

Diff for: ‎ext/intl/doc/common_api.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22

33
/**
4-
* Handling of errors occured in static methods
4+
* Handling of errors occurred in static methods
55
* when there's no object to get error code/message from.
66
*
77
* Example #1:
@@ -29,7 +29,7 @@ function intl_get_error_code() {}
2929
/**
3030
* Get description of the last error.
3131
*
32-
* @return string Description of an error occured in the last
32+
* @return string Description of an error occurred in the last
3333
* API function call.
3434
*/
3535
function intl_get_error_message() {}

Diff for: ‎ext/intl/doc/datefmt_api.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ public function getPattern() {}
215215
/**
216216
* Sets the pattern to use
217217
* @param string $pattern new pattern string to use
218-
* @return boolean 'true' if successful, 'false' if an error occured. Bad format
218+
* @return boolean 'true' if successful, 'false' if an error occurred. Bad format
219219
* strings are usually the cause of the latter.
220220
*/
221221
public function setPattern($pattern) {}
@@ -410,7 +410,7 @@ function datefmt_get_pattern($fmt) {}
410410
* Sets the pattern to use
411411
* @param DateFormatter $fmt The date formatter resource
412412
* @param string $pattern new pattern string to use
413-
* @return boolean 'true' if successful, 'false' if an error occured. Bad format
413+
* @return boolean 'true' if successful, 'false' if an error occurred. Bad format
414414
* strings are usually the cause of the latter.
415415
*/
416416
function datefmt_set_pattern($fmt , $pattern) {}

Diff for: ‎ext/intl/doc/formatter_api.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ public function getErrorCode() {}
317317
/**
318318
* Get the error text from the last operation.
319319
*
320-
* @return string Description of the last occured error.
320+
* @return string Description of the last occurred error.
321321
*/
322322
public public function getErrorMessage() {}
323323

@@ -495,6 +495,6 @@ function numfmt_get_error_code($formatter) {}
495495
* Get the error text from the last operation.
496496
*
497497
* @param NumberFormatter $formatter The formatter resource
498-
* @return string Description of the last occured error.
498+
* @return string Description of the last occurred error.
499499
*/
500500
function numfmt_get_error_message($formatter) {}

Diff for: ‎ext/intl/doc/msgfmt_api.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public function parse($value) {}
5454
* @param string $locale the locale to use when formatting numbers and dates and suchlike
5555
* @param string $pattern the pattern string to insert things into
5656
* @param array $args the array of values to insert into $pattern
57-
* @return string the formatted pattern string or false if an error occured
57+
* @return string the formatted pattern string or false if an error occurred
5858
*/
5959
public static function formatMessage($locale, $pattern, $args) {}
6060

@@ -148,7 +148,7 @@ function msgfmt_parse($fmt, $value) {}
148148
* @param string $locale the locale to use when formatting numbers and dates and suchlike
149149
* @param string $pattern the pattern string to insert things into
150150
* @param array $args the array of values to insert into $pattern
151-
* @return string the formatted pattern string or false if an error occured
151+
* @return string the formatted pattern string or false if an error occurred
152152
*/
153153
function msgfmt_format_message($locale, $pattern, $args) {}
154154

Diff for: ‎ext/intl/intl_convert.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ void intl_convert_utf8_to_utf16(
6767
return;
6868
}
6969

70-
/* Bail out if an unexpected error occured.
70+
/* Bail out if an unexpected error occurred.
7171
* (U_BUFFER_OVERFLOW_ERROR means that *target buffer is not large enough).
7272
* (U_STRING_NOT_TERMINATED_WARNING usually means that the input string is empty).
7373
*/
@@ -119,7 +119,7 @@ void intl_convert_utf16_to_utf8(
119119
*status = U_ZERO_ERROR;
120120
u_strToUTF8( NULL, 0, &dst_len, src, src_len, status );
121121

122-
/* Bail out if an unexpected error occured.
122+
/* Bail out if an unexpected error occurred.
123123
* (U_BUFFER_OVERFLOW_ERROR means that *target buffer is not large enough).
124124
* (U_STRING_NOT_TERMINATED_WARNING usually means that the input string is empty).
125125
*/

Diff for: ‎ext/intl/normalizer/normalizer_normalize.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ PHP_FUNCTION( normalizer_normalize )
110110
/* normalize */
111111
size_needed = unorm_normalize( uinput, uinput_len, form, (int32_t) 0 /* options */, uret_buf, uret_len, &status);
112112

113-
/* Bail out if an unexpected error occured.
113+
/* Bail out if an unexpected error occurred.
114114
* (U_BUFFER_OVERFLOW_ERROR means that *target buffer is not large enough).
115115
* (U_STRING_NOT_TERMINATED_WARNING usually means that the input string is empty).
116116
*/
@@ -133,7 +133,7 @@ PHP_FUNCTION( normalizer_normalize )
133133
/* try normalize again */
134134
size_needed = unorm_normalize( uinput, uinput_len, form, (int32_t) 0 /* options */, uret_buf, uret_len, &status);
135135

136-
/* Bail out if an unexpected error occured. */
136+
/* Bail out if an unexpected error occurred. */
137137
if( U_FAILURE(status) ) {
138138
/* Set error messages. */
139139
intl_error_set_custom_msg( NULL,"Error normalizing string", 0 TSRMLS_CC );
@@ -234,7 +234,7 @@ PHP_FUNCTION( normalizer_is_normalized )
234234

235235
efree( uinput );
236236

237-
/* Bail out if an unexpected error occured. */
237+
/* Bail out if an unexpected error occurred. */
238238
if( U_FAILURE(status) ) {
239239
/* Set error messages. */
240240
intl_error_set_custom_msg( NULL,"Error testing if string is the given normalization form.", 0 TSRMLS_CC );

Diff for: ‎ext/intl/tests/formatter_get_error.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ function ut_main()
1919
if( $num === false )
2020
return $fmt->getErrorMessage() . " (" . $fmt->getErrorCode() . ")\n";
2121
else
22-
return "Ooops, an error should have occured.";
22+
return "Ooops, an error should have occurred.";
2323
}
2424

2525
include_once( 'ut_common.inc' );

Diff for: ‎ext/mysqli/mysqli.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ void php_clear_stmt_bind(MY_STMT *stmt TSRMLS_DC)
162162
{
163163
if (stmt->stmt) {
164164
if (mysqli_stmt_close(stmt->stmt, TRUE)) {
165-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error occured while closing statement");
165+
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error occurred while closing statement");
166166
return;
167167
}
168168
}

Diff for: ‎ext/mysqli/tests/mysqli_stmt_affected_rows.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ require_once('skipifconnectfailure.inc');
6363
// NOTE: the error message varies with the MySQL Server version, dump only the error code!
6464
printf("[009] [%d] (error message varies with the MySQL Server version, check the error code)\n", mysqli_stmt_errno($stmt));
6565

66-
/* an error occured: affected rows should return -1 */
66+
/* an error occurred: affected rows should return -1 */
6767
if (-1 !== ($tmp = mysqli_stmt_affected_rows($stmt)))
6868
printf("[010] Expecting int/0, got %s/%s\n", gettype($tmp), $tmp);
6969

Diff for: ‎ext/mysqlnd/mysqlnd_loaddata.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ mysqlnd_handle_local_infile(MYSQLND_CONN_DATA * conn, const char * filename, zen
188188
char tmp_buf[sizeof(conn->error_info->error)];
189189
int tmp_error_no;
190190
*is_warning = TRUE;
191-
/* error occured */
191+
/* error occurred */
192192
tmp_error_no = infile.local_infile_error(info, tmp_buf, sizeof(tmp_buf) TSRMLS_CC);
193193
SET_CLIENT_ERROR(*conn->error_info, tmp_error_no, UNKNOWN_SQLSTATE, tmp_buf);
194194
/* write empty packet to server */
@@ -211,7 +211,7 @@ mysqlnd_handle_local_infile(MYSQLND_CONN_DATA * conn, const char * filename, zen
211211
goto infile_error;
212212
}
213213

214-
/* error during read occured */
214+
/* error during read occurred */
215215
if (bufsize < 0) {
216216
char tmp_buf[sizeof(conn->error_info->error)];
217217
int tmp_error_no;

Diff for: ‎ext/pcntl/pcntl.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -816,7 +816,7 @@ PHP_FUNCTION(pcntl_exec)
816816

817817
if (execve(path, argv, envp) == -1) {
818818
PCNTL_G(last_error) = errno;
819-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error has occured: (errno %d) %s", errno, strerror(errno));
819+
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error has occurred: (errno %d) %s", errno, strerror(errno));
820820
}
821821

822822
/* Cleanup */
@@ -826,7 +826,7 @@ PHP_FUNCTION(pcntl_exec)
826826

827827
if (execv(path, argv) == -1) {
828828
PCNTL_G(last_error) = errno;
829-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error has occured: (errno %d) %s", errno, strerror(errno));
829+
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error has occurred: (errno %d) %s", errno, strerror(errno));
830830
}
831831
}
832832

@@ -1127,7 +1127,7 @@ PHP_FUNCTION(pcntl_getpriority)
11271127
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error %d: Invalid identifier flag", errno);
11281128
break;
11291129
default:
1130-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown error %d has occured", errno);
1130+
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown error %d has occurred", errno);
11311131
break;
11321132
}
11331133
RETURN_FALSE;
@@ -1167,7 +1167,7 @@ PHP_FUNCTION(pcntl_setpriority)
11671167
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error %d: Only a super user may attempt to increase the process priority", errno);
11681168
break;
11691169
default:
1170-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown error %d has occured", errno);
1170+
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown error %d has occurred", errno);
11711171
break;
11721172
}
11731173
RETURN_FALSE;

Diff for: ‎ext/pcntl/tests/pcntl_exec_3.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ unlink($file);
1313
Warning: pcntl_exec() expects at least 1 parameter, 0 given %s
1414
NULL
1515

16-
Warning: pcntl_exec(): Error has occured: (errno %d) %s
16+
Warning: pcntl_exec(): Error has occurred: (errno %d) %s
1717
bool(false)

Diff for: ‎ext/pdo_mysql/mysql_statement.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ static int pdo_mysql_fill_stmt_from_result(pdo_stmt_t *stmt TSRMLS_DC) /* {{{ */
134134

135135
row_count = mysql_affected_rows(H->server);
136136
if (row_count == (my_ulonglong)-1) {
137-
/* we either have a query that returned a result set or an error occured
137+
/* we either have a query that returned a result set or an error occurred
138138
lets see if we have access to a result set */
139139
if (!H->buffered) {
140140
S->result = mysql_use_result(H->server);

Diff for: ‎ext/simplexml/tests/bug48601.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ $sxe = simplexml_load_string('<root><node1>1</node1></root>');
1010
$nodes = $sxe->xpath("/root/node2/@test");
1111

1212
if (! is_array($nodes)) {
13-
echo "An error occured\n";
13+
echo "An error occurred\n";
1414
} else {
1515
echo "Result Count: " . count($nodes) . "\n";
1616
}

0 commit comments

Comments
 (0)