Skip to content

Commit 2d48d73

Browse files
carusogabrielcmb69
carusogabriel
authored and
cmb69
committed
Fix some misspellings
1 parent 91b09c7 commit 2d48d73

Some content is hidden

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

47 files changed

+84
-85
lines changed

‎Zend/tests/bug66811.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
Bug #66811: Cannot access static::class in lambda, writen outside of a class
2+
Bug #66811: Cannot access static::class in lambda, written outside of a class
33
--FILE--
44
<?php
55
class A {

‎Zend/tests/bug70958.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
Bug #70958 (Invalid opcode while using ::class as trait method paramater default value)
2+
Bug #70958 (Invalid opcode while using ::class as trait method parameter default value)
33
--FILE--
44
<?php
55
trait Foo

‎Zend/tests/get_defined_vars.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Testing get_defined_vars() Function
33
--FILE--
44
<?php
55
/* Prototype: array get_defined_vars(void);
6-
* Description: Returns a multidimentional array of all defined variables.
6+
* Description: Returns a multidimensional array of all defined variables.
77
*/
88

99
/* Various variables definitions used for testing of the function */

‎Zend/tests/list_self_assign.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
Test variable occuring on both LHS and RHS of list()
2+
Test variable occurring on both LHS and RHS of list()
33
--FILE--
44
<?php
55

‎Zend/tests/traits/bug65576a.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ trait T
77
{
88
public function __construct()
99
{
10-
echo "Trait contructor\n";
10+
echo "Trait constructor\n";
1111
}
1212
}
1313

@@ -27,5 +27,5 @@ class B extends A
2727
new B();
2828

2929
--EXPECT--
30-
Trait contructor
30+
Trait constructor
3131

‎Zend/tests/traits/bug65576b.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ trait T
88
public function __construct()
99
{
1010
parent::__construct();
11-
echo "Trait contructor\n";
11+
echo "Trait constructor\n";
1212
}
1313
}
1414

@@ -29,5 +29,5 @@ new B();
2929

3030
--EXPECT--
3131
Parent constructor
32-
Trait contructor
32+
Trait constructor
3333

‎Zend/tests/traits/bug75607.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
Bug #75607 (Comparision of initial static properties failing)
2+
Bug #75607 (Comparison of initial static properties failing)
33
--FILE--
44
<?php
55

‎Zend/tests/traits/bug75607a.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
Bug #75607 (Comparision of initial static properties failing)
2+
Bug #75607 (Comparison of initial static properties failing)
33
--FILE--
44
<?php
55

‎Zend/zend_API.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ ZEND_API int add_assoc_zval_ex(zval *arg, const char *key, size_t key_len, zval
419419
#define add_assoc_stringl(__arg, __key, __str, __length) add_assoc_stringl_ex(__arg, __key, strlen(__key), __str, __length)
420420
#define add_assoc_zval(__arg, __key, __value) add_assoc_zval_ex(__arg, __key, strlen(__key), __value)
421421

422-
/* unset() functions are only suported for legacy modules and null() functions should be used */
422+
/* unset() functions are only supported for legacy modules and null() functions should be used */
423423
#define add_assoc_unset(__arg, __key) add_assoc_null_ex(__arg, __key, strlen(__key))
424424
#define add_index_unset(__arg, __key) add_index_null(__arg, __key)
425425
#define add_next_index_unset(__arg) add_next_index_null(__arg)

‎Zend/zend_compile.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -5378,15 +5378,15 @@ static int zend_declare_is_first_statement(zend_ast *ast) /* {{{ */
53785378
uint32_t i = 0;
53795379
zend_ast_list *file_ast = zend_ast_get_list(CG(ast));
53805380

5381-
/* Check to see if this declare is preceeded only by declare statements */
5381+
/* Check to see if this declare is preceded only by declare statements */
53825382
while (i < file_ast->children) {
53835383
if (file_ast->child[i] == ast) {
53845384
return SUCCESS;
53855385
} else if (file_ast->child[i] == NULL) {
53865386
/* Empty statements are not allowed prior to a declare */
53875387
return FAILURE;
53885388
} else if (file_ast->child[i]->kind != ZEND_AST_DECLARE) {
5389-
/* declares can only be preceeded by other declares */
5389+
/* declares can only be preceded by other declares */
53905390
return FAILURE;
53915391
}
53925392
i++;
@@ -5719,7 +5719,7 @@ void zend_compile_params(zend_ast *ast, zend_ast *return_type_ast) /* {{{ */
57195719
}
57205720
}
57215721

5722-
/* These are assigned at the end to avoid unitialized memory in case of an error */
5722+
/* These are assigned at the end to avoid uninitialized memory in case of an error */
57235723
op_array->num_args = list->children;
57245724
op_array->arg_info = arg_infos;
57255725

‎ext/dom/characterdata.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ PHP_FUNCTION(dom_characterdata_append_data)
213213

214214
DOM_GET_OBJ(nodep, id, xmlNodePtr, intern);
215215
#if LIBXML_VERSION < 20627
216-
/* Implement logic from libxml xmlTextConcat to add suport for comments and PI */
216+
/* Implement logic from libxml xmlTextConcat to add support for comments and PI */
217217
if ((nodep->content == (xmlChar *) &(nodep->properties)) ||
218218
((nodep->doc != NULL) && (nodep->doc->dict != NULL) &&
219219
xmlDictOwns(nodep->doc->dict, nodep->content))) {

‎ext/fileinfo/tests/magic

+1-1
Original file line numberDiff line numberDiff line change
@@ -7014,7 +7014,7 @@
70147014
>>>>>>>>>>>>>8 uleshort >0 \b, at offset %d
70157015
>>>>>>>>>>>>>(8.s+1) ubyte >0
70167016
>>>>>>>>>>>>>>&-1 string >\0 1st record "%s"
7017-
# for multiple index files (*.MDX) Production flag,tag numbers(<=0x30),tag length(<=0x20), reserverd (NULL)
7017+
# for multiple index files (*.MDX) Production flag,tag numbers(<=0x30),tag length(<=0x20), reserved (NULL)
70187018
>>>>>>>24 ubelong&0x0133f7ff >0
70197019
# test for reserved NULL byte
70207020
>>>>>>>>47 ubyte 0

‎ext/fileinfo/tests/magic私はガラスを食べられます

+1-1
Original file line numberDiff line numberDiff line change
@@ -7014,7 +7014,7 @@
70147014
>>>>>>>>>>>>>8 uleshort >0 \b, at offset %d
70157015
>>>>>>>>>>>>>(8.s+1) ubyte >0
70167016
>>>>>>>>>>>>>>&-1 string >\0 1st record "%s"
7017-
# for multiple index files (*.MDX) Production flag,tag numbers(<=0x30),tag length(<=0x20), reserverd (NULL)
7017+
# for multiple index files (*.MDX) Production flag,tag numbers(<=0x30),tag length(<=0x20), reserved (NULL)
70187018
>>>>>>>24 ubelong&0x0133f7ff >0
70197019
# test for reserved NULL byte
70207020
>>>>>>>>47 ubyte 0

‎ext/ftp/ftp.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1803,7 +1803,7 @@ data_accept(databuf_t *data, ftpbuf_t *ftp)
18031803
if (ftp->use_ssl && ftp->use_ssl_for_data) {
18041804
ctx = SSL_get_SSL_CTX(ftp->ssl_handle);
18051805
if (ctx == NULL) {
1806-
php_error_docref(NULL, E_WARNING, "data_accept: failed to retreive the existing SSL context");
1806+
php_error_docref(NULL, E_WARNING, "data_accept: failed to retrieve the existing SSL context");
18071807
return 0;
18081808
}
18091809

@@ -1822,7 +1822,7 @@ data_accept(databuf_t *data, ftpbuf_t *ftp)
18221822
/* get the session from the control connection so we can re-use it */
18231823
session = SSL_get_session(ftp->ssl_handle);
18241824
if (session == NULL) {
1825-
php_error_docref(NULL, E_WARNING, "data_accept: failed to retreive the existing SSL session");
1825+
php_error_docref(NULL, E_WARNING, "data_accept: failed to retrieve the existing SSL session");
18261826
SSL_free(data->ssl_handle);
18271827
return 0;
18281828
}

‎ext/gd/libgd/gd_bmp.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -708,7 +708,7 @@ static int bmp_read_direct(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info, b
708708
return 1;
709709
}
710710

711-
/* There is a chance the data isn't until later, would be wierd but it is possible */
711+
/* There is a chance the data isn't until later, would be weird but it is possible */
712712
if (gdTell(infile) != header->off) {
713713
/* Should make sure we don't seek past the file size */
714714
if (!gdSeek(infile, header->off)) {
@@ -805,7 +805,7 @@ static int bmp_read_1bit(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info, bmp
805805

806806
im->colorsTotal = info->numcolors;
807807

808-
/* There is a chance the data isn't until later, would be wierd but it is possible */
808+
/* There is a chance the data isn't until later, would be weird but it is possible */
809809
if (gdTell(infile) != header->off) {
810810
/* Should make sure we don't seek past the file size */
811811
if (!gdSeek(infile, header->off)) {
@@ -875,7 +875,7 @@ static int bmp_read_4bit(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info, bmp
875875

876876
im->colorsTotal = info->numcolors;
877877

878-
/* There is a chance the data isn't until later, would be wierd but it is possible */
878+
/* There is a chance the data isn't until later, would be weird but it is possible */
879879
if (gdTell(infile) != header->off) {
880880
/* Should make sure we don't seek past the file size */
881881
if (!gdSeek(infile, header->off)) {
@@ -962,7 +962,7 @@ static int bmp_read_8bit(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info, bmp
962962

963963
im->colorsTotal = info->numcolors;
964964

965-
/* There is a chance the data isn't until later, would be wierd but it is possible */
965+
/* There is a chance the data isn't until later, would be weird but it is possible */
966966
if (gdTell(infile) != header->off) {
967967
/* Should make sure we don't seek past the file size */
968968
if (!gdSeek(infile, header->off)) {

‎ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ mbfilter_sjis_emoji_docomo2unicode(int s, int *snd)
297297
w = mb_tbl_code2uni_docomo1[s - mb_tbl_code2uni_docomo1_min];
298298
if (w > 0xf000) {
299299
w += 0x10000;
300-
} else if (w > 0xe000) { /* unsuported by Unicode 6.0 */
300+
} else if (w > 0xe000) { /* unsupported by Unicode 6.0 */
301301
w += 0xf0000;
302302
}
303303
*snd = 0;
@@ -332,7 +332,7 @@ mbfilter_sjis_emoji_kddi2unicode(int s, int *snd)
332332
w = mb_tbl_code2uni_kddi1[si];
333333
if (w > 0xf000) {
334334
w += 0x10000;
335-
} else if (w > 0xe000) { /* unsuported by Unicode 6.0 */
335+
} else if (w > 0xe000) { /* unsupported by Unicode 6.0 */
336336
w += 0xf0000;
337337
}
338338
}
@@ -350,7 +350,7 @@ mbfilter_sjis_emoji_kddi2unicode(int s, int *snd)
350350
w = mb_tbl_code2uni_kddi2[si];
351351
if (w > 0xf000) {
352352
w += 0x10000;
353-
} else if (w > 0xe000) { /* unsuported by Unicode 6.0 */
353+
} else if (w > 0xe000) { /* unsupported by Unicode 6.0 */
354354
w += 0xf0000;
355355
}
356356
}
@@ -377,7 +377,7 @@ mbfilter_sjis_emoji_sb2unicode(int s, int *snd)
377377
w = mb_tbl_code2uni_sb1[si];
378378
if (w > 0xf000) {
379379
w += 0x10000;
380-
} else if (w > 0xe000) { /* unsuported by Unicode 6.0 */
380+
} else if (w > 0xe000) { /* unsupported by Unicode 6.0 */
381381
w += 0xf0000;
382382
}
383383
}
@@ -386,7 +386,7 @@ mbfilter_sjis_emoji_sb2unicode(int s, int *snd)
386386
w = mb_tbl_code2uni_sb2[si];
387387
if (w > 0xf000) {
388388
w += 0x10000;
389-
} else if (w > 0xe000) { /* unsuported by Unicode 6.0 */
389+
} else if (w > 0xe000) { /* unsupported by Unicode 6.0 */
390390
w += 0xf0000;
391391
}
392392
} else if (s >= mb_tbl_code2uni_sb3_min && s <= mb_tbl_code2uni_sb3_max) {
@@ -398,7 +398,7 @@ mbfilter_sjis_emoji_sb2unicode(int s, int *snd)
398398
w = mb_tbl_code2uni_sb3[si];
399399
if (w > 0xf000) {
400400
w += 0x10000;
401-
} else if (w > 0xe000) { /* unsuported by Unicode 6.0 */
401+
} else if (w > 0xe000) { /* unsupported by Unicode 6.0 */
402402
w += 0xf0000;
403403
}
404404
}

‎ext/mbstring/tests/mb_language.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ var_dump(mb_language('English'));
1919
echo "Confirm language was changed:\n";
2020
var_dump(mb_language());
2121

22-
echo "Try changing to a non-existant language:\n";
22+
echo "Try changing to a non-existent language:\n";
2323
var_dump(mb_language('Pig Latin'));
2424
var_dump(mb_language());
2525
?>
@@ -32,7 +32,7 @@ Changing language to English should be successful:
3232
bool(true)
3333
Confirm language was changed:
3434
string(7) "English"
35-
Try changing to a non-existant language:
35+
Try changing to a non-existent language:
3636

3737
Warning: mb_language(): Unknown language "Pig Latin" in %s on line %d
3838
bool(false)

‎ext/odbc/tests/bug47803.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
Bug #47803 Executing prepared statements is succesfull only for the first two statements
2+
Bug #47803 Executing prepared statements is successful only for the first two statements
33
--SKIPIF--
44
<?php include 'skipif.inc'; ?>
55
--FILE--

‎ext/opcache/Optimizer/optimize_func_calls.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ static void zend_try_inline_call(zend_op_array *op_array, zend_op *fcall, zend_o
120120
}
121121

122122
if (fcall->extended_value < func->op_array.num_args) {
123-
/* don't inline funcions with named constants in default arguments */
123+
/* don't inline functions with named constants in default arguments */
124124
i = fcall->extended_value;
125125

126126
do {

‎ext/opcache/Optimizer/zend_inference.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2799,7 +2799,7 @@ static int zend_update_type_info(const zend_op_array *op_array,
27992799
(tmp & func_info->arg_info[opline->op1.num-1].info.type);
28002800
}
28012801
#if 0
2802-
/* We won't recieve unused arguments */
2802+
/* We won't receive unused arguments */
28032803
if (ssa_vars[ssa_ops[i].result_def].use_chain < 0 &&
28042804
ssa_vars[ssa_ops[i].result_def].phi_use_chain == NULL &&
28052805
op_array->arg_info &&

‎ext/opcache/ZendAccelerator.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2801,7 +2801,7 @@ static int accel_post_startup(void)
28012801

28022802
/* from this point further, shared memory is supposed to be OK */
28032803

2804-
/* remeber the last restart time in the process memory */
2804+
/* remember the last restart time in the process memory */
28052805
ZCG(last_restart_time) = ZCSG(last_restart_time);
28062806

28072807
/* Init auto-global strings */

‎ext/openssl/tests/openssl_encrypt_error.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ $wrong = "wrong";
1212
$object = new stdclass;
1313
$arr = array(1);
1414

15-
// wrong paramters tests
15+
// wrong parameters tests
1616
var_dump(openssl_encrypt($data, $wrong, $password));
1717
var_dump(openssl_encrypt($object, $method, $password));
1818
var_dump(openssl_encrypt($data, $object, $password));

‎ext/openssl/tests/openssl_error_string_basic.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ expect_openssl_errors('openssl_pkey_export_to_file pem', ['0906D06C']);
9090
// file to export cannot be written
9191
@openssl_pkey_export_to_file($private_key_file, $invalid_file_for_write);
9292
expect_openssl_errors('openssl_pkey_export_to_file write', ['2006D002']);
93-
// succesful export
93+
// successful export
9494
@openssl_pkey_export($private_key_file_with_pass, $out, 'wrong pwd');
9595
expect_openssl_errors('openssl_pkey_export', ['06065064', '0906A065']);
9696
// invalid x509 for getting public key

‎ext/pdo_mysql/tests/bug_50323.phpt

+2-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ $db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
1818
strpos($original, ':') + 1,
1919
strlen($original));
2020

21-
// no real parser - any excotic setting can fool us
21+
// no real parser - any exotic setting can fool us
2222
$parts = explode(';', $dsn);
2323
foreach ($parts as $k => $v) {
2424
$tmp = explode('=', $v);
@@ -44,7 +44,7 @@ if (1 === @$db->exec('CREATE DATABASE `crazy;dbname`')) {
4444
$dsn = changeDSN(getenv('PDOTEST_DSN'), array('dbname' => 'crazy;;dbname'));
4545
$user = getenv('PDOTEST_USER');
4646
$pass = getenv('PDOTEST_PASS');
47-
47+
4848
new PDO($dsn, $user, $pass);
4949
}
5050
echo 'done!';
@@ -58,4 +58,3 @@ $db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
5858
?>
5959
--EXPECTF--
6060
done!
61-

‎ext/session/session.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1434,7 +1434,7 @@ PHPAPI int php_session_reset_id(void) /* {{{ */
14341434
}
14351435

14361436
/* If the SID constant exists, destroy it. */
1437-
/* We must not delete any items in EG(zend_contants) */
1437+
/* We must not delete any items in EG(zend_constants) */
14381438
/* zend_hash_str_del(EG(zend_constants), "sid", sizeof("sid") - 1); */
14391439
sid = zend_get_constant_str("SID", sizeof("SID") - 1);
14401440

‎ext/sockets/tests/socket_send.phpt

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,24 @@ if(substr(PHP_OS, 0, 3) == 'WIN' ) {
1717
$port = 80;
1818
$host = "yahoo.com";
1919
$stringSocket = "send_socket_to_connected_socket";
20-
$stringSocketLenght = strlen($stringSocket);
20+
$stringSocketLength = strlen($stringSocket);
2121

2222
$socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
2323
$socketConn = socket_connect($socket, $host, $port);
2424

25-
if(socket_send($socket, $stringSocket, $stringSocketLenght, MSG_OOB)===$stringSocketLenght){
25+
if(socket_send($socket, $stringSocket, $stringSocketLength, MSG_OOB)===$stringSocketLength){
2626
print("okey\n");
2727
}
2828

29-
if(socket_send($socket, $stringSocket, $stringSocketLenght, MSG_EOR)===$stringSocketLenght){
29+
if(socket_send($socket, $stringSocket, $stringSocketLength, MSG_EOR)===$stringSocketLength){
3030
print("okey\n");
3131
}
3232

33-
if(socket_send($socket, $stringSocket, $stringSocketLenght, MSG_EOF)===$stringSocketLenght){
33+
if(socket_send($socket, $stringSocket, $stringSocketLength, MSG_EOF)===$stringSocketLength){
3434
print("okey\n");
3535
}
3636

37-
if(socket_send($socket, $stringSocket, $stringSocketLenght, MSG_DONTROUTE)===$stringSocketLenght){
37+
if(socket_send($socket, $stringSocket, $stringSocketLength, MSG_DONTROUTE)===$stringSocketLength){
3838
print("okey\n");
3939
}
4040
?>
@@ -43,7 +43,7 @@ socket_close($socket);
4343
unset($port);
4444
unset($host);
4545
unset($stringSocket);
46-
unset($stringSocketLenght);
46+
unset($stringSocketLength);
4747
unset($socket);
4848
unset($socketConn);
4949
?>

0 commit comments

Comments
 (0)