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

‎Zend/tests/bug39018.phpt‎

Lines changed: 7 additions & 7 deletions
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

‎Zend/tests/offset_string.phpt‎

Lines changed: 4 additions & 4 deletions
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

‎Zend/zend_compile.c‎

Lines changed: 2 additions & 2 deletions
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);

‎Zend/zend_execute.c‎

Lines changed: 2 additions & 2 deletions
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:

‎ext/dom/xpath.c‎

Lines changed: 1 addition & 1 deletion
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)) {

‎ext/imap/tests/imap_errors_basic.phpt‎

Lines changed: 1 addition & 1 deletion
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

‎ext/intl/common/common_error.c‎

Lines changed: 2 additions & 2 deletions
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
{

‎ext/intl/doc/collator_api.php‎

Lines changed: 4 additions & 4 deletions
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 ) {}

‎ext/intl/doc/common_api.php‎

Lines changed: 2 additions & 2 deletions
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() {}

‎ext/intl/doc/datefmt_api.php‎

Lines changed: 2 additions & 2 deletions
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) {}

0 commit comments

Comments
 (0)