Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

  • Loading branch information...
commit 896ac689c91967dec0601fa9fe048c518da52a3c 1 parent b8d453d
Marc Easen Easen authored smalyshev committed

Showing 34 changed files with 73 additions and 73 deletions. Show diff stats Hide diff stats

  1. +7 7 Zend/tests/bug39018.phpt
  2. +4 4 Zend/tests/offset_string.phpt
  3. +2 2 Zend/zend_compile.c
  4. +2 2 Zend/zend_execute.c
  5. +1 1  ext/dom/xpath.c
  6. +1 1  ext/imap/tests/imap_errors_basic.phpt
  7. +2 2 ext/intl/common/common_error.c
  8. +4 4 ext/intl/doc/collator_api.php
  9. +2 2 ext/intl/doc/common_api.php
  10. +2 2 ext/intl/doc/datefmt_api.php
  11. +2 2 ext/intl/doc/formatter_api.php
  12. +2 2 ext/intl/doc/msgfmt_api.php
  13. +2 2 ext/intl/intl_convert.c
  14. +3 3 ext/intl/normalizer/normalizer_normalize.c
  15. +1 1  ext/intl/tests/formatter_get_error.phpt
  16. +1 1  ext/mysqli/mysqli.c
  17. +1 1  ext/mysqli/tests/mysqli_stmt_affected_rows.phpt
  18. +2 2 ext/mysqlnd/mysqlnd_loaddata.c
  19. +4 4 ext/pcntl/pcntl.c
  20. +1 1  ext/pcntl/tests/pcntl_exec_3.phpt
  21. +1 1  ext/pdo_mysql/mysql_statement.c
  22. +1 1  ext/simplexml/tests/bug48601.phpt
  23. +2 2 ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt
  24. +2 2 ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt
  25. +2 2 ext/sockets/tests/socket_sentto_recvfrom_unix.phpt
  26. +1 1  ext/spl/tests/bug52238.phpt
  27. +11 11 ext/sqlite3/libsqlite/sqlite3.c
  28. +1 1  ext/sqlite3/sqlite3.c
  29. +1 1  ext/standard/basic_functions.c
  30. +1 1  ext/standard/tests/file/umask_basic.phpt
  31. +1 1  ext/tidy/examples/cleanhtml.php
  32. +1 1  ext/tidy/examples/cleanhtml5.php
  33. +1 1  ext/tidy/tidy.c
  34. +1 1  ext/xsl/xsltprocessor.c
14 Zend/tests/bug39018.phpt
@@ -62,17 +62,17 @@ print "\nDone\n";
62 62
63 63 ?>
64 64 --EXPECTF--
65   -Notice: String offset cast occured in %s on line %d
  65 +Notice: String offset cast occurred in %s on line %d
66 66
67 67 Notice: Uninitialized string offset: 0 in %s on line %d
68 68
69 69 Notice: Uninitialized string offset: 0 in %s on line %d
70 70
71   -Notice: String offset cast occured in %s on line %d
  71 +Notice: String offset cast occurred in %s on line %d
72 72
73 73 Notice: Uninitialized string offset: %i in %s on line %d
74 74
75   -Notice: String offset cast occured in %s on line %d
  75 +Notice: String offset cast occurred in %s on line %d
76 76
77 77 Notice: Uninitialized string offset: %i in %s on line %d
78 78
@@ -88,16 +88,16 @@ Notice: Uninitialized string offset: 4 in %s on line %d
88 88
89 89 Notice: Uninitialized string offset: 4 in %s on line %d
90 90
91   -Notice: String offset cast occured in %s on line %d
  91 +Notice: String offset cast occurred in %s on line %d
92 92
93 93 Notice: Uninitialized string offset: 12 in %s on line %d
94 94
95   -Notice: String offset cast occured in %s on line %d
  95 +Notice: String offset cast occurred in %s on line %d
96 96
97 97 Notice: Uninitialized string offset: 12 in %s on line %d
98 98
99   -Notice: String offset cast occured in %s on line %d
  99 +Notice: String offset cast occurred in %s on line %d
100 100
101   -Notice: String offset cast occured in %s on line %d
  101 +Notice: String offset cast occurred in %s on line %d
102 102 b
103 103 Done
8 Zend/tests/offset_string.phpt
@@ -30,10 +30,10 @@ echo "Done\n";
30 30 --EXPECTF--
31 31 string(1) "i"
32 32
33   -Notice: String offset cast occured in %s on line %d
  33 +Notice: String offset cast occurred in %s on line %d
34 34 string(1) "S"
35 35
36   -Notice: String offset cast occured in %s on line %d
  36 +Notice: String offset cast occurred in %s on line %d
37 37 string(1) "S"
38 38
39 39 Warning: Illegal string offset 'run away' in %s on line %d
@@ -46,10 +46,10 @@ string(1) "o"
46 46 Notice: A non well formed numeric value encountered in %s on line %d
47 47 string(1) "r"
48 48
49   -Notice: String offset cast occured in %s on line %d
  49 +Notice: String offset cast occurred in %s on line %d
50 50 string(1) "i"
51 51
52   -Notice: String offset cast occured in %s on line %d
  52 +Notice: String offset cast occurred in %s on line %d
53 53 string(1) "S"
54 54
55 55 Warning: Illegal offset type in %s on line %d
4 Zend/zend_compile.c
@@ -3712,7 +3712,7 @@ static int zend_traits_merge_functions(zend_function *fn TSRMLS_DC, int num_args
3712 3712 } else {
3713 3713 /* Add it to result function table */
3714 3714 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);
3716 3716 }
3717 3717 }
3718 3718
@@ -3829,7 +3829,7 @@ static int zend_traits_merge_functions_to_class(zend_function *fn TSRMLS_DC, int
3829 3829 function_add_ref(&fn_copy);
3830 3830
3831 3831 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);
3833 3833 }
3834 3834
3835 3835 zend_add_magic_methods(ce, hash_key->arKey, hash_key->nKeyLength, fn_copy_p TSRMLS_CC);
4 Zend/zend_execute.c
@@ -1161,7 +1161,7 @@ static void zend_fetch_dimension_address(temp_variable *result, zval **container
1161 1161 case IS_DOUBLE:
1162 1162 case IS_NULL:
1163 1163 case IS_BOOL:
1164   - zend_error(E_NOTICE, "String offset cast occured");
  1164 + zend_error(E_NOTICE, "String offset cast occurred");
1165 1165 break;
1166 1166 default:
1167 1167 zend_error(E_WARNING, "Illegal offset type");
@@ -1284,7 +1284,7 @@ static void zend_fetch_dimension_address_read(temp_variable *result, zval **cont
1284 1284 case IS_NULL:
1285 1285 case IS_BOOL:
1286 1286 if (type != BP_VAR_IS) {
1287   - zend_error(E_NOTICE, "String offset cast occured");
  1287 + zend_error(E_NOTICE, "String offset cast occurred");
1288 1288 }
1289 1289 break;
1290 1290 default:
2  ext/dom/xpath.c
@@ -216,7 +216,7 @@ static void dom_xpath_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs,
216 216 if (Z_TYPE(handler) == IS_STRING) {
217 217 php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to call handler %s()", Z_STRVAL_P(&handler));
218 218 }
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 */
220 220 } else if (retval == NULL) {
221 221 } else {
222 222 if (retval->type == IS_OBJECT && instanceof_function( Z_OBJCE_P(retval), dom_node_class_entry TSRMLS_CC)) {
2  ext/imap/tests/imap_errors_basic.phpt
@@ -7,7 +7,7 @@ require_once(dirname(__FILE__).'/skipif.inc');
7 7 --FILE--
8 8 <?php
9 9 /* 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.
11 11 * Source code: ext/imap/php_imap.c
12 12 */
13 13
4 ext/intl/common/common_error.c
@@ -24,7 +24,7 @@
24 24 #include "common_error.h"
25 25
26 26 /* {{{ proto int intl_get_error_code()
27   - * Get code of the last occured error.
  27 + * Get code of the last occurred error.
28 28 */
29 29 PHP_FUNCTION( intl_get_error_code )
30 30 {
@@ -33,7 +33,7 @@ PHP_FUNCTION( intl_get_error_code )
33 33 /* }}} */
34 34
35 35 /* {{{ proto string intl_get_error_message()
36   - * Get text description of the last occured error.
  36 + * Get text description of the last occurred error.
37 37 */
38 38 PHP_FUNCTION( intl_get_error_message )
39 39 {
8 ext/intl/doc/collator_api.php
@@ -116,7 +116,7 @@ public function getErrorCode() {}
116 116 /**
117 117 * Return error text for the last ICU operation.
118 118 *
119   - * @return string Description of an error occured in the last
  119 + * @return string Description of an error occurred in the last
120 120 * Collator method call.
121 121 */
122 122 public function getErrorMessage() {}
@@ -236,7 +236,7 @@ public function setStrength( $strength ) {}
236 236 *
237 237 * @return string Real locale name from which the
238 238 * collation data comes. If the collator
239   - * was instantiated from rules or an error occured,
  239 + * was instantiated from rules or an error occurred,
240 240 * returns false.
241 241 */
242 242 public function getLocale( $type ) {}
@@ -331,7 +331,7 @@ function collator_sort_with_sort_keys( $coll, $arr ) {}
331 331 *
332 332 * @return string Real locale name from which the
333 333 * collation data comes. If the collator
334   - * was instantiated from rules or an error occured,
  334 + * was instantiated from rules or an error occurred,
335 335 * returns false.
336 336 */
337 337 function collator_get_locale( $coll, $type ) {}
@@ -391,7 +391,7 @@ function collator_get_error_code( $coll ) {}
391 391 *
392 392 * @param Collator $coll Collator object.
393 393 *
394   - * @return string Description of an error occured in the last
  394 + * @return string Description of an error occurred in the last
395 395 * Collator API function call.
396 396 */
397 397 function collator_get_error_message( $coll ) {}
4 ext/intl/doc/common_api.php
... ... @@ -1,7 +1,7 @@
1 1 <?php
2 2
3 3 /**
4   - * Handling of errors occured in static methods
  4 + * Handling of errors occurred in static methods
5 5 * when there's no object to get error code/message from.
6 6 *
7 7 * Example #1:
@@ -29,7 +29,7 @@ function intl_get_error_code() {}
29 29 /**
30 30 * Get description of the last error.
31 31 *
32   - * @return string Description of an error occured in the last
  32 + * @return string Description of an error occurred in the last
33 33 * API function call.
34 34 */
35 35 function intl_get_error_message() {}
4 ext/intl/doc/datefmt_api.php
@@ -215,7 +215,7 @@ public function getPattern() {}
215 215 /**
216 216 * Sets the pattern to use
217 217 * @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
219 219 * strings are usually the cause of the latter.
220 220 */
221 221 public function setPattern($pattern) {}
@@ -410,7 +410,7 @@ function datefmt_get_pattern($fmt) {}
410 410 * Sets the pattern to use
411 411 * @param DateFormatter $fmt The date formatter resource
412 412 * @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
414 414 * strings are usually the cause of the latter.
415 415 */
416 416 function datefmt_set_pattern($fmt , $pattern) {}
4 ext/intl/doc/formatter_api.php
@@ -317,7 +317,7 @@ public function getErrorCode() {}
317 317 /**
318 318 * Get the error text from the last operation.
319 319 *
320   - * @return string Description of the last occured error.
  320 + * @return string Description of the last occurred error.
321 321 */
322 322 public public function getErrorMessage() {}
323 323
@@ -495,6 +495,6 @@ function numfmt_get_error_code($formatter) {}
495 495 * Get the error text from the last operation.
496 496 *
497 497 * @param NumberFormatter $formatter The formatter resource
498   - * @return string Description of the last occured error.
  498 + * @return string Description of the last occurred error.
499 499 */
500 500 function numfmt_get_error_message($formatter) {}
4 ext/intl/doc/msgfmt_api.php
@@ -54,7 +54,7 @@ public function parse($value) {}
54 54 * @param string $locale the locale to use when formatting numbers and dates and suchlike
55 55 * @param string $pattern the pattern string to insert things into
56 56 * @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
58 58 */
59 59 public static function formatMessage($locale, $pattern, $args) {}
60 60
@@ -148,7 +148,7 @@ function msgfmt_parse($fmt, $value) {}
148 148 * @param string $locale the locale to use when formatting numbers and dates and suchlike
149 149 * @param string $pattern the pattern string to insert things into
150 150 * @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
152 152 */
153 153 function msgfmt_format_message($locale, $pattern, $args) {}
154 154
4 ext/intl/intl_convert.c
@@ -67,7 +67,7 @@ void intl_convert_utf8_to_utf16(
67 67 return;
68 68 }
69 69
70   - /* Bail out if an unexpected error occured.
  70 + /* Bail out if an unexpected error occurred.
71 71 * (U_BUFFER_OVERFLOW_ERROR means that *target buffer is not large enough).
72 72 * (U_STRING_NOT_TERMINATED_WARNING usually means that the input string is empty).
73 73 */
@@ -119,7 +119,7 @@ void intl_convert_utf16_to_utf8(
119 119 *status = U_ZERO_ERROR;
120 120 u_strToUTF8( NULL, 0, &dst_len, src, src_len, status );
121 121
122   - /* Bail out if an unexpected error occured.
  122 + /* Bail out if an unexpected error occurred.
123 123 * (U_BUFFER_OVERFLOW_ERROR means that *target buffer is not large enough).
124 124 * (U_STRING_NOT_TERMINATED_WARNING usually means that the input string is empty).
125 125 */
6 ext/intl/normalizer/normalizer_normalize.c
@@ -110,7 +110,7 @@ PHP_FUNCTION( normalizer_normalize )
110 110 /* normalize */
111 111 size_needed = unorm_normalize( uinput, uinput_len, form, (int32_t) 0 /* options */, uret_buf, uret_len, &status);
112 112
113   - /* Bail out if an unexpected error occured.
  113 + /* Bail out if an unexpected error occurred.
114 114 * (U_BUFFER_OVERFLOW_ERROR means that *target buffer is not large enough).
115 115 * (U_STRING_NOT_TERMINATED_WARNING usually means that the input string is empty).
116 116 */
@@ -133,7 +133,7 @@ PHP_FUNCTION( normalizer_normalize )
133 133 /* try normalize again */
134 134 size_needed = unorm_normalize( uinput, uinput_len, form, (int32_t) 0 /* options */, uret_buf, uret_len, &status);
135 135
136   - /* Bail out if an unexpected error occured. */
  136 + /* Bail out if an unexpected error occurred. */
137 137 if( U_FAILURE(status) ) {
138 138 /* Set error messages. */
139 139 intl_error_set_custom_msg( NULL,"Error normalizing string", 0 TSRMLS_CC );
@@ -234,7 +234,7 @@ PHP_FUNCTION( normalizer_is_normalized )
234 234
235 235 efree( uinput );
236 236
237   - /* Bail out if an unexpected error occured. */
  237 + /* Bail out if an unexpected error occurred. */
238 238 if( U_FAILURE(status) ) {
239 239 /* Set error messages. */
240 240 intl_error_set_custom_msg( NULL,"Error testing if string is the given normalization form.", 0 TSRMLS_CC );
2  ext/intl/tests/formatter_get_error.phpt
@@ -19,7 +19,7 @@ function ut_main()
19 19 if( $num === false )
20 20 return $fmt->getErrorMessage() . " (" . $fmt->getErrorCode() . ")\n";
21 21 else
22   - return "Ooops, an error should have occured.";
  22 + return "Ooops, an error should have occurred.";
23 23 }
24 24
25 25 include_once( 'ut_common.inc' );
2  ext/mysqli/mysqli.c
@@ -162,7 +162,7 @@ void php_clear_stmt_bind(MY_STMT *stmt TSRMLS_DC)
162 162 {
163 163 if (stmt->stmt) {
164 164 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");
166 166 return;
167 167 }
168 168 }
2  ext/mysqli/tests/mysqli_stmt_affected_rows.phpt
@@ -63,7 +63,7 @@ require_once('skipifconnectfailure.inc');
63 63 // NOTE: the error message varies with the MySQL Server version, dump only the error code!
64 64 printf("[009] [%d] (error message varies with the MySQL Server version, check the error code)\n", mysqli_stmt_errno($stmt));
65 65
66   - /* an error occured: affected rows should return -1 */
  66 + /* an error occurred: affected rows should return -1 */
67 67 if (-1 !== ($tmp = mysqli_stmt_affected_rows($stmt)))
68 68 printf("[010] Expecting int/0, got %s/%s\n", gettype($tmp), $tmp);
69 69
4 ext/mysqlnd/mysqlnd_loaddata.c
@@ -188,7 +188,7 @@ mysqlnd_handle_local_infile(MYSQLND_CONN_DATA * conn, const char * filename, zen
188 188 char tmp_buf[sizeof(conn->error_info->error)];
189 189 int tmp_error_no;
190 190 *is_warning = TRUE;
191   - /* error occured */
  191 + /* error occurred */
192 192 tmp_error_no = infile.local_infile_error(info, tmp_buf, sizeof(tmp_buf) TSRMLS_CC);
193 193 SET_CLIENT_ERROR(*conn->error_info, tmp_error_no, UNKNOWN_SQLSTATE, tmp_buf);
194 194 /* write empty packet to server */
@@ -211,7 +211,7 @@ mysqlnd_handle_local_infile(MYSQLND_CONN_DATA * conn, const char * filename, zen
211 211 goto infile_error;
212 212 }
213 213
214   - /* error during read occured */
  214 + /* error during read occurred */
215 215 if (bufsize < 0) {
216 216 char tmp_buf[sizeof(conn->error_info->error)];
217 217 int tmp_error_no;
8 ext/pcntl/pcntl.c
@@ -816,7 +816,7 @@ PHP_FUNCTION(pcntl_exec)
816 816
817 817 if (execve(path, argv, envp) == -1) {
818 818 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));
820 820 }
821 821
822 822 /* Cleanup */
@@ -826,7 +826,7 @@ PHP_FUNCTION(pcntl_exec)
826 826
827 827 if (execv(path, argv) == -1) {
828 828 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));
830 830 }
831 831 }
832 832
@@ -1127,7 +1127,7 @@ PHP_FUNCTION(pcntl_getpriority)
1127 1127 php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error %d: Invalid identifier flag", errno);
1128 1128 break;
1129 1129 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);
1131 1131 break;
1132 1132 }
1133 1133 RETURN_FALSE;
@@ -1167,7 +1167,7 @@ PHP_FUNCTION(pcntl_setpriority)
1167 1167 php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error %d: Only a super user may attempt to increase the process priority", errno);
1168 1168 break;
1169 1169 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);
1171 1171 break;
1172 1172 }
1173 1173 RETURN_FALSE;
2  ext/pcntl/tests/pcntl_exec_3.phpt
@@ -13,5 +13,5 @@ unlink($file);
13 13 Warning: pcntl_exec() expects at least 1 parameter, 0 given %s
14 14 NULL
15 15
16   -Warning: pcntl_exec(): Error has occured: (errno %d) %s
  16 +Warning: pcntl_exec(): Error has occurred: (errno %d) %s
17 17 bool(false)
2  ext/pdo_mysql/mysql_statement.c
@@ -134,7 +134,7 @@ static int pdo_mysql_fill_stmt_from_result(pdo_stmt_t *stmt TSRMLS_DC) /* {{{ */
134 134
135 135 row_count = mysql_affected_rows(H->server);
136 136 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
138 138 lets see if we have access to a result set */
139 139 if (!H->buffered) {
140 140 S->result = mysql_use_result(H->server);
2  ext/simplexml/tests/bug48601.phpt
@@ -10,7 +10,7 @@ $sxe = simplexml_load_string('<root><node1>1</node1></root>');
10 10 $nodes = $sxe->xpath("/root/node2/@test");
11 11
12 12 if (! is_array($nodes)) {
13   - echo "An error occured\n";
  13 + echo "An error occurred\n";
14 14 } else {
15 15 echo "Result Count: " . count($nodes) . "\n";
16 16 }
4 ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt
@@ -25,7 +25,7 @@ if (!extension_loaded('sockets')) {
25 25 $len = strlen($msg);
26 26 $bytes_sent = socket_sendto($socket, $msg, $len, 0, $address, 1223);
27 27 if ($bytes_sent == -1) {
28   - die('An error occured while sending to the socket');
  28 + die('An error occurred while sending to the socket');
29 29 } else if ($bytes_sent != $len) {
30 30 die($bytes_sent . ' bytes have been sent instead of the ' . $len . ' bytes expected');
31 31 }
@@ -36,7 +36,7 @@ if (!extension_loaded('sockets')) {
36 36 socket_recvfrom($socket, $buf, 12, 0, $from); // cause warning
37 37 $bytes_received = socket_recvfrom($socket, $buf, 12, 0, $from, $port);
38 38 if ($bytes_received == -1) {
39   - die('An error occured while receiving from the socket');
  39 + die('An error occurred while receiving from the socket');
40 40 } else if ($bytes_received != $len) {
41 41 die($bytes_received . ' bytes have been received instead of the ' . $len . ' bytes expected');
42 42 }
4 ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt
@@ -26,7 +26,7 @@ require 'ipv6_skipif.inc';
26 26 $len = strlen($msg);
27 27 $bytes_sent = socket_sendto($socket, $msg, $len, 0, $address, 1223);
28 28 if ($bytes_sent == -1) {
29   - die('An error occured while sending to the socket');
  29 + die('An error occurred while sending to the socket');
30 30 } else if ($bytes_sent != $len) {
31 31 die($bytes_sent . ' bytes have been sent instead of the ' . $len . ' bytes expected');
32 32 }
@@ -37,7 +37,7 @@ require 'ipv6_skipif.inc';
37 37 socket_recvfrom($socket, $buf, 12, 0, $from); // cause warning
38 38 $bytes_received = socket_recvfrom($socket, $buf, 12, 0, $from, $port);
39 39 if ($bytes_received == -1) {
40   - die('An error occured while receiving from the socket');
  40 + die('An error occurred while receiving from the socket');
41 41 } else if ($bytes_received != $len) {
42 42 die($bytes_received . ' bytes have been received instead of the ' . $len . ' bytes expected');
43 43 }
4 ext/sockets/tests/socket_sentto_recvfrom_unix.phpt
@@ -30,7 +30,7 @@ if (!extension_loaded('sockets')) {
30 30 $bytes_sent = socket_sendto($socket, $msg, $len, 0, $address);
31 31 if ($bytes_sent == -1) {
32 32 @unlink($address);
33   - die('An error occured while sending to the socket');
  33 + die('An error occurred while sending to the socket');
34 34 } else if ($bytes_sent != $len) {
35 35 @unlink($address);
36 36 die($bytes_sent . ' bytes have been sent instead of the ' . $len . ' bytes expected');
@@ -41,7 +41,7 @@ if (!extension_loaded('sockets')) {
41 41 $bytes_received = socket_recvfrom($socket, $buf, 12, 0, $from);
42 42 if ($bytes_received == -1) {
43 43 @unlink($address);
44   - die('An error occured while receiving from the socket');
  44 + die('An error occurred while receiving from the socket');
45 45 } else if ($bytes_received != $len) {
46 46 @unlink($address);
47 47 die($bytes_received . ' bytes have been received instead of the ' . $len . ' bytes expected');
2  ext/spl/tests/bug52238.phpt
... ... @@ -1,5 +1,5 @@
1 1 --TEST--
2   -Bug #52238 - Crash when an Exception occured in iterator_to_array
  2 +Bug #52238 - Crash when an Exception occurred in iterator_to_array
3 3 --FILE--
4 4 <?php
5 5 class Foo implements IteratorAggregate
22 ext/sqlite3/libsqlite/sqlite3.c
@@ -23307,7 +23307,7 @@ static int os2OpenSharedMemory( os2File *fd, int szRegion ) {
23307 23307 sqlite3_mutex_leave(pNode->mutex);
23308 23308
23309 23309 } else {
23310   - /* Error occured. Free our link object. */
  23310 + /* Error occurred. Free our link object. */
23311 23311 sqlite3_free(pLink);
23312 23312 }
23313 23313
@@ -28994,7 +28994,7 @@ static int fillInUnixFile(
28994 28994 unixEnterMutex();
28995 28995 rc = findInodeInfo(pNew, &pNew->pInode);
28996 28996 if( rc!=SQLITE_OK ){
28997   - /* If an error occured in findInodeInfo(), close the file descriptor
  28997 + /* If an error occurred in findInodeInfo(), close the file descriptor
28998 28998 ** immediately, before releasing the mutex. findInodeInfo() may fail
28999 28999 ** in two scenarios:
29000 29000 **
@@ -32173,7 +32173,7 @@ static int seekWinFile(winFile *pFile, sqlite3_int64 iOffset){
32173 32173 ** containing the lower 32-bits of the new file-offset. Or, if it fails,
32174 32174 ** it returns INVALID_SET_FILE_POINTER. However according to MSDN,
32175 32175 ** INVALID_SET_FILE_POINTER may also be a valid new offset. So to determine
32176   - ** whether an error has actually occured, it is also necessary to call
  32176 + ** whether an error has actually occurred, it is also necessary to call
32177 32177 ** GetLastError().
32178 32178 */
32179 32179 dwRet = SetFilePointer(pFile->h, lowerBits, &upperBits, FILE_BEGIN);
@@ -32273,7 +32273,7 @@ static int winWrite(
32273 32273 int amt, /* Number of bytes to write */
32274 32274 sqlite3_int64 offset /* Offset into the file to begin writing at */
32275 32275 ){
32276   - int rc; /* True if error has occured, else false */
  32276 + int rc; /* True if error has occurred, else false */
32277 32277 winFile *pFile = (winFile*)id; /* File handle */
32278 32278
32279 32279 assert( amt>0 );
@@ -37068,7 +37068,7 @@ int sqlite3PagerTrace=1; /* True to enable tracing */
37068 37068 ** * A write transaction is active.
37069 37069 ** * An EXCLUSIVE or greater lock is held on the database file.
37070 37070 ** * All writing and syncing of journal and database data has finished.
37071   -** If no error occured, all that remains is to finalize the journal to
  37071 +** If no error occurred, all that remains is to finalize the journal to
37072 37072 ** commit the transaction. If an error did occur, the caller will need
37073 37073 ** to rollback the transaction.
37074 37074 **
@@ -54279,7 +54279,7 @@ SQLITE_PRIVATE int sqlite3BtreeInsert(
54279 54279 insertCell(pPage, idx, newCell, szNew, 0, 0, &rc);
54280 54280 assert( rc!=SQLITE_OK || pPage->nCell>0 || pPage->nOverflow>0 );
54281 54281
54282   - /* If no error has occured and pPage has an overflow cell, call balance()
  54282 + /* If no error has occurred and pPage has an overflow cell, call balance()
54283 54283 ** to redistribute the cells within the tree. Since balance() may move
54284 54284 ** the cursor, zero the BtCursor.info.nSize and BtCursor.validNKey
54285 54285 ** variables.
@@ -57935,7 +57935,7 @@ SQLITE_PRIVATE int sqlite3VdbeAssertMayAbort(Vdbe *v, int mayAbort){
57935 57935 }
57936 57936 sqlite3DbFree(v->db, sIter.apSub);
57937 57937
57938   - /* Return true if hasAbort==mayAbort. Or if a malloc failure occured.
  57938 + /* Return true if hasAbort==mayAbort. Or if a malloc failure occurred.
57939 57939 ** If malloc failed, then the while() loop above may not have iterated
57940 57940 ** through all opcodes and hasAbort may be set incorrectly. Return
57941 57941 ** true for this case to prevent the assert() in the callers frame
@@ -59562,7 +59562,7 @@ SQLITE_PRIVATE int sqlite3VdbeCloseStatement(Vdbe *p, int eOp){
59562 59562
59563 59563 /* If p->iStatement is greater than zero, then this Vdbe opened a
59564 59564 ** statement transaction that should be closed here. The only exception
59565   - ** is that an IO error may have occured, causing an emergency rollback.
  59565 + ** is that an IO error may have occurred, causing an emergency rollback.
59566 59566 ** In this case (db->nStatement==0), and there is nothing to do.
59567 59567 */
59568 59568 if( db->nStatement && p->iStatement ){
@@ -59697,7 +59697,7 @@ SQLITE_PRIVATE int sqlite3VdbeHalt(Vdbe *p){
59697 59697 **
59698 59698 ** Even if the statement is read-only, it is important to perform
59699 59699 ** a statement or transaction rollback operation. If the error
59700   - ** occured while writing to the journal, sub-journal or database
  59700 + ** occurred while writing to the journal, sub-journal or database
59701 59701 ** file as part of an effort to free up cache space (see function
59702 59702 ** pagerStress() in pager.c), the rollback is required to restore
59703 59703 ** the pager to a consistent state.
@@ -61245,7 +61245,7 @@ static int sqlite3Step(Vdbe *p){
61245 61245 assert( p->rc!=SQLITE_ROW && p->rc!=SQLITE_DONE );
61246 61246 if( p->isPrepareV2 && rc!=SQLITE_ROW && rc!=SQLITE_DONE ){
61247 61247 /* If this statement was prepared using sqlite3_prepare_v2(), and an
61248   - ** error has occured, then return the error code in p->rc to the
  61248 + ** error has occurred, then return the error code in p->rc to the
61249 61249 ** caller. Set the error code in the database handle to the same value.
61250 61250 */
61251 61251 rc = db->errCode = p->rc;
@@ -113286,7 +113286,7 @@ static int fts3CursorSeek(sqlite3_context *pContext, Fts3Cursor *pCsr){
113286 113286 }else{
113287 113287 int rc = sqlite3_reset(pCsr->pStmt);
113288 113288 if( rc==SQLITE_OK ){
113289   - /* If no row was found and no error has occured, then the %_content
  113289 + /* If no row was found and no error has occurred, then the %_content
113290 113290 ** table is missing a row that is present in the full-text index.
113291 113291 ** The data structures are corrupt.
113292 113292 */
2  ext/sqlite3/sqlite3.c
@@ -1097,7 +1097,7 @@ static int php_sqlite3_stream_close(php_stream *stream, int close_handle TSRMLS_
1097 1097 php_stream_sqlite3_data *sqlite3_stream = (php_stream_sqlite3_data *) stream->abstract;
1098 1098
1099 1099 if (sqlite3_blob_close(sqlite3_stream->blob) != SQLITE_OK) {
1100   - /* Error occured, but it still closed */
  1100 + /* Error occurred, but it still closed */
1101 1101 }
1102 1102
1103 1103 efree(sqlite3_stream);
2  ext/standard/basic_functions.c
@@ -3833,7 +3833,7 @@ PHP_NAMED_FUNCTION(php_inet_ntop)
3833 3833 }
3834 3834
3835 3835 if (!inet_ntop(af, address, buffer, sizeof(buffer))) {
3836   - php_error_docref(NULL TSRMLS_CC, E_WARNING, "An unknown error occured");
  3836 + php_error_docref(NULL TSRMLS_CC, E_WARNING, "An unknown error occurred");
3837 3837 RETURN_FALSE;
3838 3838 }
3839 3839
2  ext/standard/tests/file/umask_basic.phpt
@@ -20,7 +20,7 @@ for($mask = 0000; $mask <= 0777; $mask++) {
20 20 var_dump( umask() );
21 21 echo "\n";
22 22 if ($mask != umask()) {
23   - die('An error occured while changing back the umask');
  23 + die('An error occurred while changing back the umask');
24 24 }
25 25 }
26 26
2  ext/tidy/examples/cleanhtml.php
@@ -26,7 +26,7 @@
26 26 if(tidy_warning_count() ||
27 27 tidy_error_count()) {
28 28
29   - echo "\n\nThe following errors or warnings occured:\n";
  29 + echo "\n\nThe following errors or warnings occurred:\n";
30 30 echo tidy_get_error_buffer();
31 31 echo "\n";
32 32 }
2  ext/tidy/examples/cleanhtml5.php
@@ -25,7 +25,7 @@
25 25
26 26 if(!empty($tidy->errorBuffer)) {
27 27
28   - echo "\n\nThe following errors or warnings occured:\n";
  28 + echo "\n\nThe following errors or warnings occurred:\n";
29 29 echo "{$tidy->errorBuffer}\n";
30 30
31 31 }
2  ext/tidy/tidy.c
@@ -1238,7 +1238,7 @@ static PHP_FUNCTION(tidy_parse_string)
1238 1238 /* }}} */
1239 1239
1240 1240 /* {{{ proto string tidy_get_error_buffer()
1241   - Return warnings and errors which occured parsing the specified document*/
  1241 + Return warnings and errors which occurred parsing the specified document*/
1242 1242 static PHP_FUNCTION(tidy_get_error_buffer)
1243 1243 {
1244 1244 TIDY_FETCH_OBJECT;
2  ext/xsl/xsltprocessor.c
@@ -336,7 +336,7 @@ static void xsl_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs, int t
336 336 php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to call handler %s()", Z_STRVAL_P(&handler));
337 337 valuePush(ctxt, xmlXPathNewString(""));
338 338 }
339   - /* retval is == NULL, when an exception occured, don't report anything, because PHP itself will handle that */
  339 + /* retval is == NULL, when an exception occurred, don't report anything, because PHP itself will handle that */
340 340 } else if (retval == NULL) {
341 341 } else {
342 342 if (retval->type == IS_OBJECT && instanceof_function( Z_OBJCE_P(retval), dom_node_class_entry TSRMLS_CC)) {

0 comments on commit 896ac68

Please sign in to comment.
Something went wrong with that request. Please try again.