Skip to content

Commit 5a9d50d

Browse files
authored
Fix typos, grammatical errors, and refactor misspelled local identifiers (#23803)
Correct typographical and grammatical mistakes across docs, comments, and build tools. Refactor local identifiers childrens to children in RecursiveFilterIterator and sav to saved_char in sapi_header_add_op.
1 parent b30219a commit 5a9d50d

24 files changed

Lines changed: 37 additions & 37 deletions

‎Zend/zend_API.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1785,7 +1785,7 @@ ZEND_API void object_properties_load(zend_object *object, const HashTable *prope
17851785
(property_info->flags & ZEND_ACC_STATIC) == 0) {
17861786
bool is_typed = ZEND_TYPE_IS_SET(property_info->type);
17871787

1788-
/* Mimick unserialize behaviour for virtual properties. */
1788+
/* Mimic unserialize behaviour for virtual properties. */
17891789
if (UNEXPECTED(property_info->flags & ZEND_ACC_VIRTUAL)) {
17901790
zend_throw_error(NULL, "Cannot unserialize value for virtual property %s::$%s", ZSTR_VAL(object->ce->name), zend_get_unmangled_property_name(property_info->name));
17911791
return;
@@ -1808,7 +1808,7 @@ ZEND_API void object_properties_load(zend_object *object, const HashTable *prope
18081808
ZVAL_COPY(&val, prop);
18091809
ZEND_REF_ADD_TYPE_SOURCE(Z_REF_P(&val), property_info);
18101810
} else {
1811-
/* Mimick zend_assign_to_typed_prop() by reporting the error before doing work. */
1811+
/* Mimic zend_assign_to_typed_prop() by reporting the error before doing work. */
18121812
if (UNEXPECTED((property_info->flags & ZEND_ACC_READONLY)
18131813
&& !Z_ISUNDEF_P(slot)
18141814
&& !(Z_PROP_FLAG_P(slot) & IS_PROP_REINITABLE))) {

‎Zend/zend_call_stack.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ static bool zend_call_stack_get_linux_proc_maps(zend_call_stack *stack)
245245
max_size = rlim.rlim_cur;
246246

247247
#ifdef HAVE_VALGRIND
248-
/* Under Valgrind, the last page is not useable */
248+
/* Under Valgrind, the last page is not usable */
249249
if (RUNNING_ON_VALGRIND) {
250250
max_size -= zend_get_page_size();
251251
}
@@ -388,7 +388,7 @@ static bool zend_call_stack_get_win32(zend_call_stack *stack)
388388
* is left in the uncommitted region, a stack overflow error is raised
389389
* instead.
390390
*
391-
* The total useable stack size is the size of the committed and uncommitted
391+
* The total usable stack size is the size of the committed and uncommitted
392392
* regions less one page.
393393
*
394394
* http://blogs.msdn.com/b/satyem/archive/2012/08/13/thread-s-stack-memory-management.aspx

‎Zend/zend_partial.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -914,13 +914,13 @@ static zend_op_array *zp_compile(zval *this_ptr, zend_function *function,
914914
/**
915915
* Generate function body.
916916
*
917-
* If we may need to forward superflous arguments, do that conditionally, as
917+
* If we may need to forward superfluous arguments, do that conditionally, as
918918
* it's faster:
919919
*
920920
* if (func_num_args() <= n) {
921921
* // normal call
922922
* } else {
923-
* // call with superflous arg forwarding
923+
* // call with superfluous arg forwarding
924924
* }
925925
*
926926
* The func_num_args() call should be compiled to a single FUNC_NUM_ARGS op.

‎build/gen_stub.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2413,7 +2413,7 @@ public function getCExpr(): ?string
24132413
// interpolation shouldn't be possible in a stub, so we don't need
24142414
// to worry about mangling such a case.
24152415
if (preg_match("/(^'|'$)/", $expr)) {
2416-
$expr = substr($expr, 1, -1); // strip quotes, readd later
2416+
$expr = substr($expr, 1, -1); // strip quotes, re-add later
24172417
$expr = str_replace("\\'", "'", $expr);
24182418
$expr = addcslashes($expr, "\\\"");
24192419
$expr = "\"$expr\"";

‎docs/release-process.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1094,7 +1094,7 @@ volunteers to begin the selection process for the next release managers.
10941094
10951095
4. File a [ticket in the infrastructure](https://github.com/php/infrastructure/issues/new?template=request-release-manager-access.yml)
10961096
project and provide an SSH key, your @php.net email address, your GitHub
1097-
account name, and your preferred system account name. Preferrably they're
1097+
account name, and your preferred system account name. Preferably they're
10981098
all the same!
10991099
11001100
5. Read [Logging into Servers](https://github.com/php/infrastructure/blob/main/docs/ServerAccess.rst#logging-into-servers) to set up

‎ext/dom/html_document.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ static void dom_lexbor_libxml2_bridge_tree_error_reporter(
302302
dom_lexbor_libxml2_bridge_application_data *application_data = application_data_voidptr;
303303

304304
if (line == 1 && application_data->html_no_implied && error->id == LXB_HTML_RULES_ERROR_UNTOININMO) {
305-
/* For no implied mode, we want to mimick libxml's behaviour of not reporting an error for a lacking doctype. */
305+
/* For no implied mode, we want to mimic libxml's behaviour of not reporting an error for a lacking doctype. */
306306
return;
307307
}
308308

‎ext/ext_skel.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ function process_args($argv, $argc) {
223223
// Validate vendor
224224
if (!preg_match('/^[a-z][a-z0-9_-]+$/i', $options['vendor'])) {
225225
error('Invalid vendor name. Valid names start with a letter,'
226-
.' followed by any number of letters, numbers, hypens, or underscores.');
226+
.' followed by any number of letters, numbers, hyphens, or underscores.');
227227
}
228228

229229
$options['ext'] = str_replace(['\\', '/'], '', strtolower($options['ext']));

‎ext/ftp/php_ftp.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,7 @@ PHP_FUNCTION(ftp_fget)
615615
}
616616
/* }}} */
617617

618-
/* {{{ Retrieves a file from the FTP server asynchronly and writes it to an open file */
618+
/* {{{ Retrieves a file from the FTP server asynchronously and writes it to an open file */
619619
PHP_FUNCTION(ftp_nb_fget)
620620
{
621621
zval *z_ftp;

‎ext/opcache/ZendAccelerator.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3674,7 +3674,7 @@ static zend_result accel_post_startup(void)
36743674
}
36753675

36763676
if (ZCG(enabled) && accel_startup_ok) {
3677-
/* Override inheritance cache callbaks */
3677+
/* Override inheritance cache callbacks */
36783678
accelerator_orig_inheritance_cache_get = zend_inheritance_cache_get;
36793679
accelerator_orig_inheritance_cache_add = zend_inheritance_cache_add;
36803680
zend_inheritance_cache_get = zend_accel_inheritance_cache_get;

‎ext/opcache/jit/zend_jit.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2032,7 +2032,7 @@ static int zend_jit(const zend_op_array *op_array, zend_ssa *ssa, const zend_op
20322032
}
20332033
op1_info = OP1_INFO();
20342034
if (ra && ssa->vars[ssa_op->op1_use].no_val) {
2035-
op1_info |= MAY_BE_UNDEF; // requres type assignment
2035+
op1_info |= MAY_BE_UNDEF; // requires type assignment
20362036
}
20372037
if (opline->result_type == IS_UNUSED) {
20382038
res_addr = 0;

0 commit comments

Comments
 (0)