Skip to content

Commit 1577fd4

Browse files
committed
Fix some typos
1 parent 98049e8 commit 1577fd4

16 files changed

+23
-23
lines changed

Zend/tests/array_unpack/undef_var.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
array unpacking with undefinded variable
2+
array unpacking with undefined variable
33
--FILE--
44
<?php
55

@@ -11,4 +11,4 @@ Notice: Undefined variable: arr in %s on line %d
1111
Fatal error: Uncaught Error: Only arrays and Traversables can be unpacked in %s:%d
1212
Stack trace:
1313
#0 {main}
14-
thrown in %s on line %d
14+
thrown in %s on line %d

Zend/tests/generators/unused_return_value.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
There shouldn't be any leaks when the genertor's return value isn't used
2+
There shouldn't be any leaks when the generator's return value isn't used
33
--FILE--
44
<?php
55

Zend/tests/traits/property007.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ trait THello1 {
1212
}
1313

1414
// Protected and public are handle more strict with a warning then what is
15-
// expected from normal inheritance since they can have easier coliding semantics
15+
// expected from normal inheritance since they can have easier colliding semantics
1616
echo "PRE-CLASS-GUARD\n";
1717
class SameNameInSubClassProducesNotice extends Base {
1818
use THello1;

Zend/tests/traits/trait_constant_001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
__TRAIT__: Basics, a constant denoiting the trait of definition.
2+
__TRAIT__: Basics, a constant denoting the trait of definition.
33
--FILE--
44
<?php
55

Zend/tests/unset_cv11.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
unset() CV 11 (unset() of copy destoies original value)
2+
unset() CV 11 (unset() of copy destroys original value)
33
--FILE--
44
<?php
55
$x = array("default"=>"ok");

Zend/zend.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1360,8 +1360,8 @@ static ZEND_COLD void zend_error_va_list(
13601360
ZVAL_COPY_VALUE(&orig_user_error_handler, &EG(user_error_handler));
13611361
ZVAL_UNDEF(&EG(user_error_handler));
13621362

1363-
/* User error handler may include() additinal PHP files.
1364-
* If an error was generated during comilation PHP will compile
1363+
/* User error handler may include() additional PHP files.
1364+
* If an error was generated during compilation PHP will compile
13651365
* such scripts recursively, but some CG() variables may be
13661366
* inconsistent. */
13671367

Zend/zend_builtin_functions.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1950,7 +1950,7 @@ ZEND_FUNCTION(get_resource_type)
19501950
}
19511951
/* }}} */
19521952

1953-
/* {{{ proto array get_resources([string resouce_type])
1953+
/* {{{ proto array get_resources([string resource_type])
19541954
Get an array with all active resources */
19551955
ZEND_FUNCTION(get_resources)
19561956
{

Zend/zend_compile.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,7 @@ static int zend_add_ns_func_name_literal(zend_string *name) /* {{{ */
552552
zend_string *lc_name = zend_string_tolower(name);
553553
zend_add_literal_string(&lc_name);
554554

555-
/* Lowercased unqualfied name */
555+
/* Lowercased unqualified name */
556556
if (zend_get_unqualified_name(name, &unqualified_name, &unqualified_name_len)) {
557557
lc_name = zend_string_alloc(unqualified_name_len, 0);
558558
zend_str_tolower_copy(ZSTR_VAL(lc_name), unqualified_name, unqualified_name_len);

Zend/zend_compile.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ typedef struct _zend_oparray_context {
240240
/* Class linked with parent, interfacs and traits | | | */
241241
#define ZEND_ACC_LINKED (1 << 3) /* X | | | */
242242
/* | | | */
243-
/* class is abstarct, since it is set by any | | | */
243+
/* class is abstract, since it is set by any | | | */
244244
/* abstract method | | | */
245245
#define ZEND_ACC_IMPLICIT_ABSTRACT_CLASS (1 << 4) /* X | | | */
246246
/* | | | */
@@ -1047,7 +1047,7 @@ END_EXTERN_C()
10471047
#define ZEND_COMPILE_EXTENDED_FCALL (1<<1)
10481048
#define ZEND_COMPILE_EXTENDED_INFO (ZEND_COMPILE_EXTENDED_STMT|ZEND_COMPILE_EXTENDED_FCALL)
10491049

1050-
/* call op_array handler of extendions */
1050+
/* call op_array handler of extensions */
10511051
#define ZEND_COMPILE_HANDLE_OP_ARRAY (1<<2)
10521052

10531053
/* generate ZEND_INIT_FCALL_BY_NAME for internal functions instead of ZEND_INIT_FCALL */

Zend/zend_gc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
* ------------------------------------------
3434
*
3535
* GREEN - Acyclic
36-
* RED - Candidate cycle underogin
36+
* RED - Candidate cycle undergoing
3737
* ORANGE - Candidate cycle awaiting epoch boundary.
3838
*
3939
*

Zend/zend_generators.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -804,7 +804,7 @@ ZEND_API void zend_generator_resume(zend_generator *orig_generator) /* {{{ */
804804
orig_generator->flags &= ~ZEND_GENERATOR_DO_INIT;
805805
return;
806806
}
807-
/* If there are no more deletegated values, resume the generator
807+
/* If there are no more delegated values, resume the generator
808808
* after the "yield from" expression. */
809809
}
810810

Zend/zend_hash.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1795,7 +1795,7 @@ ZEND_API void ZEND_FASTCALL zend_hash_graceful_reverse_destroy(HashTable *ht)
17951795
* return codes are possible:
17961796
* ZEND_HASH_APPLY_KEEP - continue
17971797
* ZEND_HASH_APPLY_STOP - stop iteration
1798-
* ZEND_HASH_APPLY_REMOVE - delete the element, combineable with the former
1798+
* ZEND_HASH_APPLY_REMOVE - delete the element, combinable with the former
17991799
*/
18001800

18011801
ZEND_API void ZEND_FASTCALL zend_hash_apply(HashTable *ht, apply_func_t apply_func)

Zend/zend_inheritance.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1573,7 +1573,7 @@ static void zend_add_trait_method(zend_class_entry *ce, const char *name, zend_s
15731573
if (*overridden) {
15741574
if ((existing_fn = zend_hash_find_ptr(*overridden, key)) != NULL) {
15751575
if (existing_fn->common.fn_flags & ZEND_ACC_ABSTRACT) {
1576-
/* Make sure the trait method is compatible with previosly declared abstract method */
1576+
/* Make sure the trait method is compatible with previously declared abstract method */
15771577
perform_delayable_implementation_check(
15781578
ce, fn, existing_fn, /*always_error*/ 1);
15791579
}
@@ -1668,7 +1668,7 @@ static void zend_traits_copy_functions(zend_string *fnname, zend_function *fn, z
16681668
&& (zend_binary_strcasecmp(ZSTR_VAL(alias->trait_method.method_name), ZSTR_LEN(alias->trait_method.method_name), ZSTR_VAL(fnname), ZSTR_LEN(fnname)) == 0)) {
16691669
fn_copy = *fn;
16701670

1671-
/* if it is 0, no modifieres has been changed */
1671+
/* if it is 0, no modifiers has been changed */
16721672
if (alias->modifiers) {
16731673
fn_copy.common.fn_flags = alias->modifiers | (fn->common.fn_flags ^ (fn->common.fn_flags & ZEND_ACC_PPP_MASK));
16741674
}
@@ -2122,7 +2122,7 @@ static void zend_do_bind_traits(zend_class_entry *ce) /* {{{ */
21222122
traits[i] = trait;
21232123
}
21242124

2125-
/* complete initialization of trait strutures in ce */
2125+
/* complete initialization of trait structures in ce */
21262126
zend_traits_init_trait_structures(ce, traits, &exclude_tables, &aliases);
21272127

21282128
/* first care about all methods to be flattened into the class */
@@ -2139,7 +2139,7 @@ static void zend_do_bind_traits(zend_class_entry *ce) /* {{{ */
21392139
efree(exclude_tables);
21402140
}
21412141

2142-
/* then flatten the properties into it, to, mostly to notfiy developer about problems */
2142+
/* then flatten the properties into it, to, mostly to notify developer about problems */
21432143
zend_do_traits_property_binding(ce, traits);
21442144

21452145
efree(traits);

Zend/zend_signal.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ void zend_signal_handler_defer(int signo, siginfo_t *siginfo, void *context)
118118
} else { /* delay signal handling */
119119
SIGG(blocked) = 1; /* signal is blocked */
120120

121-
if ((queue = SIGG(pavail))) { /* if none available it's simply forgotton */
121+
if ((queue = SIGG(pavail))) { /* if none available it's simply forgotten */
122122
SIGG(pavail) = queue->next;
123123
queue->zend_signal.signo = signo;
124124
queue->zend_signal.siginfo = siginfo;

Zend/zend_types.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,7 @@ static zend_always_inline uint32_t zval_gc_info(uint32_t gc_type_info) {
545545
/* zval_gc_flags(zval.value->gc.u.type_info) (common flags) */
546546
#define GC_COLLECTABLE (1<<4)
547547
#define GC_PROTECTED (1<<5) /* used for recursion detection */
548-
#define GC_IMMUTABLE (1<<6) /* can't be canged in place */
548+
#define GC_IMMUTABLE (1<<6) /* can't be changed in place */
549549
#define GC_PERSISTENT (1<<7) /* allocated using malloc */
550550
#define GC_PERSISTENT_LOCAL (1<<8) /* persistent, but thread-local */
551551

Zend/zend_vm_gen.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -702,7 +702,7 @@ function opcode_name($name, $spec, $op1, $op2, $extra_spec) {
702702

703703
if (isset($opnames[$name])) {
704704
$opcode = $opcodes[$opnames[$name]];
705-
// If we haven't helper with specified spicialized operands then
705+
// If we haven't helper with specified specialized operands then
706706
// using unspecialized helper
707707
if (!isset($opcode["op1"][$op1])) {
708708
if (($op1 == 'TMP' || $op1 == 'VAR') &&
@@ -1710,7 +1710,7 @@ function read_order_file($fn) {
17101710
return $order;
17111711
}
17121712

1713-
// Generates all opcode handlers and helpers (specialized or unspecilaized)
1713+
// Generates all opcode handlers and helpers (specialized or unspecialized)
17141714
function gen_executor_code($f, $spec, $kind, $prolog, &$switch_labels = array()) {
17151715
global $list, $opcodes, $helpers, $op_types_ex, $gen_order;
17161716

0 commit comments

Comments
 (0)