Skip to content

Commit 462da6e

Browse files
jsorefnikic
authored andcommitted
Fix spelling and grammar mistakes
This PR corrects misspellings identified by the check-spelling action. The misspellings have been reported at jsoref/php-src@b6ba3e2#commitcomment-48946465 The action reports that the changes in this PR would make it happy: jsoref/php-src@602417c Closes GH-6822.
1 parent 02557e6 commit 462da6e

File tree

106 files changed

+248
-245
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+248
-245
lines changed

CODING_STANDARDS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
This file lists several standards that any programmer adding or changing code in
44
PHP should follow. Since this file was added at a very late stage of the
55
development of PHP v3.0, the code base does not fully follow it, but new
6-
features are going in that general direction. Many sections have been recoded to
6+
features are going in that general direction. Many sections have been rewritten to
77
use these rules.
88

99
## Code implementation

NEWS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ PHP NEWS
7878
- MySQLnd:
7979
. Fixed bug #80761 (PDO uses too much memory). (Nikita)
8080

81-
- Opcache:
81+
- OPcache:
8282
. Added inheritance cache. (Dmitry)
8383

8484
- OpenSSL:

TSRM/tsrm_win32.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ TSRM_API int tsrm_win32_access(const char *pathname, int mode)
254254
goto Finished;
255255
}
256256

257-
/* Different identity, we need a new impersontated token as well */
257+
/* Different identity, we need a new impersonated token as well */
258258
if (!TWG(impersonation_token_sid) || !EqualSid(token_sid, TWG(impersonation_token_sid))) {
259259
if (TWG(impersonation_token_sid)) {
260260
free(TWG(impersonation_token_sid));

UPGRADING

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,12 @@ PHP 8.1 UPGRADE NOTES
113113
- PDO SQLite:
114114
. Integers and floats in results sets will now be returned using native PHP
115115
types. You can restore the previous behavior by enabling the
116-
PDO::ATTR_STRINGFIY_FETCHES option.
116+
PDO::ATTR_STRINGIFY_FETCHES option.
117117

118118
- Standard:
119119
. version_compare() no longer accepts undocumented operator abbreviations.
120120
. htmlspecialchars(), htmlentities(), htmlspecialchars_decode(),
121-
html_entitity_decode() and get_html_translation_table() now use
121+
html_entity_decode() and get_html_translation_table() now use
122122
ENT_QUOTES | ENT_SUBSTITUTE rather than ENT_COMPAT by default. This means
123123
that ' is escaped to ' while previously it was left alone.
124124
Additionally, malformed UTF-8 will be replaced by a Unicode substitution
@@ -187,7 +187,7 @@ PHP 8.1 UPGRADE NOTES
187187
echo $h, "\n";
188188
```
189189

190-
A valid seed value is within the range from 0 to the plaform defined UINT_MAX, usually 4294967295.
190+
A valid seed value is within the range from 0 to the platform defined UINT_MAX, usually 4294967295.
191191

192192
. Added xxHash. The implementation brings in the following arguments
193193

@@ -262,7 +262,7 @@ PHP 8.1 UPGRADE NOTES
262262
etc. was changed. Now properties are naturally ordered according to their
263263
declaration and inheritance. Properties declared in a base class are going
264264
to be before the child properties. This order is consistent with internal
265-
layout of properies in zend_objct structure and repeats the order in
265+
layout of properties in zend_object structure and repeats the order in
266266
default_properties_table[] and properties_info_table[]. The old order was
267267
not documented and was caused by class inheritance implementation details.
268268

Zend/Optimizer/block_pass.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1458,7 +1458,7 @@ static void zend_jmp_optimization(zend_basic_block *block, zend_op_array *op_arr
14581458
/* is not used on the following path and */
14591459
/* should be used once on the branch path. */
14601460
/* */
1461-
/* The pattern works well only if jums processed in */
1461+
/* The pattern works well only if jumps processed in */
14621462
/* direct order, otherwise it breaks JMPZ_EX */
14631463
/* sequences too early. */
14641464
last_op->result.var = target->result.var;

Zend/Optimizer/dce.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ int dce_optimize_op_array(zend_op_array *op_array, zend_ssa *ssa, bool reorder_d
541541
}
542542
} FOREACH_PHI_END();
543543

544-
/* Mark reacable instruction without side effects as dead */
544+
/* Mark reachable instruction without side effects as dead */
545545
int b = ssa->cfg.blocks_count;
546546
while (b > 0) {
547547
int op_data = -1;

Zend/Optimizer/pass1.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ void zend_optimizer_pass1(zend_op_array *op_array, zend_optimizer_ctx *ctx)
111111
|| opline->extended_value == ZEND_DIV
112112
|| opline->extended_value == ZEND_POW) {
113113
if (Z_TYPE(ZEND_OP2_LITERAL(opline)) == IS_STRING) {
114-
/* don't optimise if it should produce a runtime numeric string error */
114+
/* don't optimize if it should produce a runtime numeric string error */
115115
if (is_numeric_string(Z_STRVAL(ZEND_OP2_LITERAL(opline)), Z_STRLEN(ZEND_OP2_LITERAL(opline)), NULL, NULL, 0)) {
116116
convert_scalar_to_number(&ZEND_OP2_LITERAL(opline));
117117
}
@@ -120,7 +120,7 @@ void zend_optimizer_pass1(zend_op_array *op_array, zend_optimizer_ctx *ctx)
120120
|| opline->extended_value == ZEND_SL
121121
|| opline->extended_value == ZEND_SR) {
122122
if (Z_TYPE(ZEND_OP2_LITERAL(opline)) != IS_LONG) {
123-
/* don't optimise if it should produce a runtime numeric string error */
123+
/* don't optimize if it should produce a runtime numeric string error */
124124
if (!(Z_TYPE(ZEND_OP2_LITERAL(opline)) == IS_STRING
125125
&& !is_numeric_string(Z_STRVAL(ZEND_OP2_LITERAL(opline)), Z_STRLEN(ZEND_OP2_LITERAL(opline)), NULL, NULL, 0))) {
126126
convert_to_long(&ZEND_OP2_LITERAL(opline));
@@ -311,7 +311,7 @@ void zend_optimizer_pass1(zend_op_array *op_array, zend_optimizer_ctx *ctx)
311311
}
312312
if (send1_opline->opcode != ZEND_SEND_VAL ||
313313
send1_opline->op1_type != IS_CONST) {
314-
/* don't colllect constants after unknown function call */
314+
/* don't collect constants after unknown function call */
315315
collect_constants = 0;
316316
break;
317317
}
@@ -323,7 +323,7 @@ void zend_optimizer_pass1(zend_op_array *op_array, zend_optimizer_ctx *ctx)
323323
}
324324
if (send1_opline->opcode != ZEND_SEND_VAL ||
325325
send1_opline->op1_type != IS_CONST) {
326-
/* don't colllect constants after unknown function call */
326+
/* don't collect constants after unknown function call */
327327
collect_constants = 0;
328328
break;
329329
}
@@ -335,7 +335,7 @@ void zend_optimizer_pass1(zend_op_array *op_array, zend_optimizer_ctx *ctx)
335335
if (init_opline->opcode != ZEND_INIT_FCALL ||
336336
init_opline->op2_type != IS_CONST ||
337337
Z_TYPE(ZEND_OP2_LITERAL(init_opline)) != IS_STRING) {
338-
/* don't colllect constants after unknown function call */
338+
/* don't collect constants after unknown function call */
339339
collect_constants = 0;
340340
break;
341341
}
@@ -504,7 +504,7 @@ void zend_optimizer_pass1(zend_op_array *op_array, zend_optimizer_ctx *ctx)
504504
break;
505505
}
506506
}
507-
/* don't colllect constants after any other function call */
507+
/* don't collect constants after any other function call */
508508
collect_constants = 0;
509509
break;
510510
}

Zend/Optimizer/pass3.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ void zend_optimizer_pass3(zend_op_array *op_array, zend_optimizer_ctx *ctx)
261261
/* is not used on the following path and */
262262
/* should be used once on the branch path. */
263263
/* */
264-
/* The pattern works well only if jums processed in */
264+
/* The pattern works well only if jumps processed in */
265265
/* direct order, otherwise it breaks JMPZ_EX */
266266
/* sequences too early. */
267267
opline->result.var = target->result.var;

Zend/Optimizer/zend_call_graph.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ struct _zend_call_info {
4545
struct _zend_func_info {
4646
int num;
4747
uint32_t flags;
48-
zend_ssa ssa; /* Static Single Assignmnt Form */
48+
zend_ssa ssa; /* Static Single Assignment Form */
4949
zend_call_info *caller_info; /* where this function is called from */
5050
zend_call_info *callee_info; /* which functions are called from this one */
5151
zend_call_info **call_map; /* Call info associated with init/call/send opnum */

Zend/Optimizer/zend_dump.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -926,7 +926,7 @@ ZEND_API void zend_dump_op_array(const zend_op_array *op_array, uint32_t dump_fl
926926
}
927927
}
928928
if (func_flags & ZEND_FUNC_IRREDUCIBLE) {
929-
fprintf(stderr, ", irreducable");
929+
fprintf(stderr, ", irreducible");
930930
}
931931
if (func_flags & ZEND_FUNC_NO_LOOPS) {
932932
fprintf(stderr, ", no_loops");

0 commit comments

Comments
 (0)