Skip to content

Commit dabc28d

Browse files
cmb69cmb69
committed
Fix #78880: Spelling error report
We fix the most often occuring typos according to a recent codespell report[1] in tests, code comments and documentation. [1] <https://fossies.org/linux/test/php-src-master-f8f48ce.191129.tar.gz/codespell.html>.
1 parent eff56f8 commit dabc28d

File tree

168 files changed

+781
-781
lines changed

Some content is hidden

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

168 files changed

+781
-781
lines changed

‎EXTENSIONS

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ SINCE: 5.3
6060
-------------------------------------------------------------------------------
6161
EXTENSION: phpdbg
6262
PRIMARY MAINTAINER: Joe Watkins <krakjoe@php.net>, Bob Weinand <bwoebi@php.net>
63-
MAINTENANCE: Unkown
63+
MAINTENANCE: Unknown
6464
STATUS: 5.6
6565
-------------------------------------------------------------------------------
6666

@@ -431,7 +431,7 @@ STATUS: Working
431431
SINCE: 4.0.2
432432
-------------------------------------------------------------------------------
433433
EXTENSION: readline
434-
PRIMARY MAINTAINER: Unkown
434+
PRIMARY MAINTAINER: Unknown
435435
MAINTENANCE: Unknown
436436
STATUS: Working
437437
-------------------------------------------------------------------------------
@@ -480,17 +480,17 @@ STATUS: Working
480480
SINCE: 5.0.0
481481
-------------------------------------------------------------------------------
482482
EXTENSION: sysvmsg
483-
PRIMARY MAINTAINER: Unkown
483+
PRIMARY MAINTAINER: Unknown
484484
MAINTENANCE: Unknown
485485
STATUS: Working
486486
-------------------------------------------------------------------------------
487487
EXTENSION: sysvsem
488-
PRIMARY MAINTAINER: Unkown
488+
PRIMARY MAINTAINER: Unknown
489489
MAINTENANCE: Unknown
490490
STATUS: Working
491491
-------------------------------------------------------------------------------
492492
EXTENSION: sysvshm
493-
PRIMARY MAINTAINER: Unkown
493+
PRIMARY MAINTAINER: Unknown
494494
MAINTENANCE: Unknown
495495
STATUS: Working
496496
-------------------------------------------------------------------------------

‎Zend/tests/try/try_catch_finally_006.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ function foo($ex = NULL) {
1313
if ($ex) throw $ex;
1414
}
1515
} catch (Exception $e) {
16-
var_dump("catched");
16+
var_dump("caught");
1717
if ($ex) return "return1";
1818
} finally {
1919
var_dump("finally2");
@@ -34,6 +34,6 @@ string(8) "finally2"
3434
string(5) "label"
3535
string(7) "return2"
3636
string(8) "finally1"
37-
string(7) "catched"
37+
string(6) "caught"
3838
string(8) "finally2"
3939
string(7) "return1"

‎Zend/tests/try/try_catch_finally_007.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ function foo($ret = FALSE) {
2020
} catch (Exception $e) {
2121
goto local;
2222
local:
23-
var_dump("catched");
23+
var_dump("caught");
2424
if ($ret) return "return";
2525
} finally {
2626
var_dump("finally2");
@@ -36,11 +36,11 @@ var_dump(foo(true));
3636
?>
3737
--EXPECT--
3838
string(8) "finally1"
39-
string(7) "catched"
39+
string(6) "caught"
4040
string(8) "finally2"
4141
string(5) "label"
4242
NULL
4343
string(8) "finally1"
44-
string(7) "catched"
44+
string(6) "caught"
4545
string(8) "finally2"
4646
string(6) "return"

‎ext/date/tests/DateTimeZone_clone_basic2.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
Testing clone on objects whoose class derived from DateTimeZone class
2+
Testing clone on objects whose class derived from DateTimeZone class
33
--FILE--
44
<?php
55
//Set the default time zone
@@ -15,7 +15,7 @@ class DateTimeZoneExt2 extends DateTimeZoneExt1 {
1515
public $property4 = 10.5;
1616
}
1717

18-
echo "*** Testing clone on objects whoose class derived from DateTimeZone class ***\n";
18+
echo "*** Testing clone on objects whose class derived from DateTimeZone class ***\n";
1919

2020
$d1 = new DateTimeZoneExt1("Europe/London");
2121
var_dump($d1);
@@ -29,7 +29,7 @@ var_dump($d2_clone);
2929

3030
?>
3131
--EXPECTF--
32-
*** Testing clone on objects whoose class derived from DateTimeZone class ***
32+
*** Testing clone on objects whose class derived from DateTimeZone class ***
3333
object(DateTimeZoneExt1)#%d (4) {
3434
["property1"]=>
3535
int(99)

‎ext/date/tests/DateTime_clone_basic2.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
Test clone of objects whoose class derived from DateTime class
2+
Test clone of objects whose class derived from DateTime class
33
--FILE--
44
<?php
55
//Set the default time zone
@@ -16,7 +16,7 @@ class DateTimeExt2 extends DateTimeExt1 {
1616
public $property4 = 10.5;
1717
}
1818

19-
echo "*** Testing clone on objects whoose class derived from DateTime class ***\n";
19+
echo "*** Testing clone on objects whose class derived from DateTime class ***\n";
2020

2121
$d1 = new DateTimeExt1("2009-02-03 12:34:41 GMT");
2222
var_dump($d1);
@@ -29,7 +29,7 @@ $d2_clone = clone $d2;
2929
var_dump($d2_clone);
3030
?>
3131
--EXPECTF--
32-
*** Testing clone on objects whoose class derived from DateTime class ***
32+
*** Testing clone on objects whose class derived from DateTime class ***
3333
object(DateTimeExt1)#%d (5) {
3434
["property1"]=>
3535
int(99)

‎ext/opcache/Optimizer/zend_ssa.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ static zend_bool needs_pi(const zend_op_array *op_array, zend_dfg *dfg, zend_ssa
5454
return 0;
5555
}
5656

57-
/* Make sure that both sucessors of the from block aren't the same. Pi nodes are associated
57+
/* Make sure that both successors of the from block aren't the same. Pi nodes are associated
5858
* with predecessor blocks, so we can't distinguish which edge the pi belongs to. */
5959
from_block = &ssa->cfg.blocks[from];
6060
ZEND_ASSERT(from_block->successors_count == 2);

‎ext/opcache/jit/libudis86/decode.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -889,7 +889,7 @@ decode_operand(struct ud *u,
889889
/*
890890
* decode_operands
891891
*
892-
* Disassemble upto 3 operands of the current instruction being
892+
* Disassemble up to 3 operands of the current instruction being
893893
* disassembled. By the end of the function, the operand fields
894894
* of the ud structure will have been filled.
895895
*/

‎ext/opcache/jit/zend_jit_x86.dasc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8852,7 +8852,7 @@ static uint32_t zend_get_known_property_offset(zend_class_entry *ce, zend_string
88528852

88538853
if (ce->ce_flags & ZEND_ACC_INHERITED) {
88548854
if (!ce->parent) {
8855-
/* propery offests may be changed by inheritance */
8855+
/* property offests may be changed by inheritance */
88568856
return ZEND_WRONG_PROPERTY_OFFSET;
88578857
} else {
88588858
zend_class_entry *parent = ce->parent;

‎ext/pdo_mysql/tests/pdo_mysql_stmt_fetch_serialize.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ MySQLPDOTest::skip();
1616
class myclass implements Serializable {
1717

1818
private static $instance = null;
19-
protected $myprotected = 'a protected propery';
19+
protected $myprotected = 'a protected property';
2020

2121
// Good old magic stuff
2222
private function __construct($caller = NULL) {
@@ -129,22 +129,22 @@ Unserializing the previously serialized object...
129129
myclass::unserialize('Data from serialize')
130130
object(myclass)#4 (1) {
131131
["myprotected":protected]=>
132-
string(19) "a protected propery"
132+
string(20) "a protected property"
133133
}
134134

135135
Using PDO::FETCH_CLASS|PDO::FETCH_SERIALIZE to fetch the object from DB and unserialize it...
136136
myclass::unserialize('C:7:"myclass":19:{Data from serialize}')
137137
object(myclass)#%d (1) {
138138
["myprotected":protected]=>
139-
string(19) "a protected propery"
139+
string(20) "a protected property"
140140
}
141141

142142
Using PDO::FETCH_CLASS to fetch the object from DB and unserialize it...
143143
myclass::__set(myobj, 'C:7:"myclass":19:{Data from serialize}')
144144
myclass::__construct(PDO shall call __construct())
145145
object(myclass)#%d (2) {
146146
["myprotected":protected]=>
147-
string(19) "a protected propery"
147+
string(20) "a protected property"
148148
["myobj"]=>
149149
string(38) "C:7:"myclass":19:{Data from serialize}"
150150
}

‎ext/pdo_oci/tests/bug_33707.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require 'ext/pdo/tests/pdo_test.inc';
1212
$db = PDOTest::test_factory('ext/pdo_oci/tests/common.phpt');
1313
$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_SILENT);
1414

15-
$rs = $db->query('select blah from a_table_that_doesnt_exist');
15+
$rs = $db->query('select blah from a_table_that_does_not_exist');
1616
var_dump($rs);
1717
var_dump($db->errorInfo());
1818
--EXPECTF--

‎ext/pgsql/tests/bug71998.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ $r = pg_query($db, "SELECT * FROM tmp_statistics");
7070
while (false != ($row = pg_fetch_row($r))) {
7171
var_dump($row);
7272
}
73-
echo $errors, " errors catched\n";
73+
echo $errors, " errors caught\n";
7474

7575
pg_query($db, "DROP TABLE tmp_statistics");
7676
pg_close($db);
@@ -191,4 +191,4 @@ array(2) {
191191
[1]=>
192192
string(19) "2001:4f8:3:ba::/112"
193193
}
194-
7 errors catched
194+
7 errors caught

‎ext/reflection/tests/010.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
ReflectionMethod::__toString() tests (overriden method)
2+
ReflectionMethod::__toString() tests (overridden method)
33
--FILE--
44
<?php
55
class Foo {

‎ext/reflection/tests/ReflectionClass_getConstant_basic.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ foreach($classes as $class) {
2020
echo "Reflecting on class $class: \n";
2121
$rc = new ReflectionClass($class);
2222
var_dump($rc->getConstant('a'));
23-
var_dump($rc->getConstant('doesntexist'));
23+
var_dump($rc->getConstant('doesnotexist'));
2424
}
2525
?>
2626
--EXPECT--

‎ext/reflection/tests/ReflectionClass_getMethod_001.phpt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ foreach($classes as $class) {
3737
var_dump($rc->getMethod("s"));
3838
echo " --> Check for F(): ";
3939
var_dump($rc->getMethod("F"));
40-
echo " --> Check for doesntExist(): ";
40+
echo " --> Check for doesNotExist(): ";
4141
try {
42-
var_dump($rc->getMethod("doesntExist"));
42+
var_dump($rc->getMethod("doesNotExist"));
4343
} catch (Exception $e) {
4444
echo $e->getMessage() . "\n";
4545
}
@@ -65,7 +65,7 @@ Reflecting on class pubf:
6565
["class"]=>
6666
string(4) "pubf"
6767
}
68-
--> Check for doesntExist(): Method doesntExist does not exist
68+
--> Check for doesNotExist(): Method doesNotExist does not exist
6969
Reflecting on class subpubf:
7070
--> Check for f(): object(ReflectionMethod)#%d (2) {
7171
["name"]=>
@@ -85,7 +85,7 @@ Reflecting on class subpubf:
8585
["class"]=>
8686
string(4) "pubf"
8787
}
88-
--> Check for doesntExist(): Method doesntExist does not exist
88+
--> Check for doesNotExist(): Method doesNotExist does not exist
8989
Reflecting on class protf:
9090
--> Check for f(): object(ReflectionMethod)#%d (2) {
9191
["name"]=>
@@ -105,7 +105,7 @@ Reflecting on class protf:
105105
["class"]=>
106106
string(5) "protf"
107107
}
108-
--> Check for doesntExist(): Method doesntExist does not exist
108+
--> Check for doesNotExist(): Method doesNotExist does not exist
109109
Reflecting on class subprotf:
110110
--> Check for f(): object(ReflectionMethod)#%d (2) {
111111
["name"]=>
@@ -125,7 +125,7 @@ Reflecting on class subprotf:
125125
["class"]=>
126126
string(5) "protf"
127127
}
128-
--> Check for doesntExist(): Method doesntExist does not exist
128+
--> Check for doesNotExist(): Method doesNotExist does not exist
129129
Reflecting on class privf:
130130
--> Check for f(): object(ReflectionMethod)#%d (2) {
131131
["name"]=>
@@ -145,7 +145,7 @@ Reflecting on class privf:
145145
["class"]=>
146146
string(5) "privf"
147147
}
148-
--> Check for doesntExist(): Method doesntExist does not exist
148+
--> Check for doesNotExist(): Method doesNotExist does not exist
149149
Reflecting on class subprivf:
150150
--> Check for f(): object(ReflectionMethod)#%d (2) {
151151
["name"]=>
@@ -165,4 +165,4 @@ Reflecting on class subprivf:
165165
["class"]=>
166166
string(5) "privf"
167167
}
168-
--> Check for doesntExist(): Method doesntExist does not exist
168+
--> Check for doesNotExist(): Method doesNotExist does not exist

‎ext/reflection/tests/ReflectionClass_getProperty_001.phpt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ foreach($classes as $class) {
5050
echo $e->getMessage() . "\n";
5151
}
5252
try {
53-
echo " --> Check for doesntExist: ";
54-
var_dump($rc->getProperty("doesntExist"));
53+
echo " --> Check for doesNotExist: ";
54+
var_dump($rc->getProperty("doesNotExist"));
5555
} catch (exception $e) {
5656
echo $e->getMessage() . "\n";
5757
}
@@ -73,7 +73,7 @@ Reflecting on class pubf:
7373
string(4) "pubf"
7474
}
7575
--> Check for A: Property A does not exist
76-
--> Check for doesntExist: Property doesntExist does not exist
76+
--> Check for doesNotExist: Property doesNotExist does not exist
7777
Reflecting on class subpubf:
7878
--> Check for s: object(ReflectionProperty)#%d (2) {
7979
["name"]=>
@@ -88,7 +88,7 @@ Reflecting on class subpubf:
8888
string(4) "pubf"
8989
}
9090
--> Check for A: Property A does not exist
91-
--> Check for doesntExist: Property doesntExist does not exist
91+
--> Check for doesNotExist: Property doesNotExist does not exist
9292
Reflecting on class protf:
9393
--> Check for s: object(ReflectionProperty)#%d (2) {
9494
["name"]=>
@@ -103,7 +103,7 @@ Reflecting on class protf:
103103
string(5) "protf"
104104
}
105105
--> Check for A: Property A does not exist
106-
--> Check for doesntExist: Property doesntExist does not exist
106+
--> Check for doesNotExist: Property doesNotExist does not exist
107107
Reflecting on class subprotf:
108108
--> Check for s: object(ReflectionProperty)#%d (2) {
109109
["name"]=>
@@ -118,7 +118,7 @@ Reflecting on class subprotf:
118118
string(5) "protf"
119119
}
120120
--> Check for A: Property A does not exist
121-
--> Check for doesntExist: Property doesntExist does not exist
121+
--> Check for doesNotExist: Property doesNotExist does not exist
122122
Reflecting on class privf:
123123
--> Check for s: object(ReflectionProperty)#%d (2) {
124124
["name"]=>
@@ -133,7 +133,7 @@ Reflecting on class privf:
133133
string(5) "privf"
134134
}
135135
--> Check for A: Property A does not exist
136-
--> Check for doesntExist: Property doesntExist does not exist
136+
--> Check for doesNotExist: Property doesNotExist does not exist
137137
Reflecting on class subprivf:
138138
--> Check for s: object(ReflectionProperty)#%d (2) {
139139
["name"]=>
@@ -143,4 +143,4 @@ Reflecting on class subprivf:
143143
}
144144
--> Check for a: Property a does not exist
145145
--> Check for A: Property A does not exist
146-
--> Check for doesntExist: Property doesntExist does not exist
146+
--> Check for doesNotExist: Property doesNotExist does not exist

‎ext/reflection/tests/ReflectionClass_getProperty_003.phpt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ showInfo("privB");
7070
showInfo("pubC");
7171
showInfo("protC");
7272
showInfo("privC");
73-
showInfo("doesntExist");
73+
showInfo("doesNotExist");
7474

7575
showInfo("A::pubC");
7676
showInfo("A::protC");
@@ -89,9 +89,9 @@ showInfo("C::privC");
8989
showInfo("X::pubC");
9090
showInfo("X::protC");
9191
showInfo("X::privC");
92-
showInfo("X::doesntExist");
92+
showInfo("X::doesNotExist");
9393

94-
showInfo("doesntexist::doesntExist");
94+
showInfo("doesNotexist::doesNotExist");
9595

9696
?>
9797
--EXPECTF--
@@ -155,8 +155,8 @@ object(ReflectionProperty)#%d (2) {
155155
string(1) "C"
156156
}
157157
Cannot access non-public member C::$privC
158-
--- (Reflecting on doesntExist) ---
159-
Property doesntExist does not exist
158+
--- (Reflecting on doesNotExist) ---
159+
Property doesNotExist does not exist
160160
--- (Reflecting on A::pubC) ---
161161
object(ReflectionProperty)#%d (2) {
162162
["name"]=>
@@ -245,7 +245,7 @@ Fully qualified property name X::pubC does not specify a base class of C
245245
Fully qualified property name X::protC does not specify a base class of C
246246
--- (Reflecting on X::privC) ---
247247
Fully qualified property name X::privC does not specify a base class of C
248-
--- (Reflecting on X::doesntExist) ---
249-
Fully qualified property name X::doesntExist does not specify a base class of C
250-
--- (Reflecting on doesntexist::doesntExist) ---
251-
Class doesntexist does not exist
248+
--- (Reflecting on X::doesNotExist) ---
249+
Fully qualified property name X::doesNotExist does not specify a base class of C
250+
--- (Reflecting on doesNotexist::doesNotExist) ---
251+
Class doesnotexist does not exist

0 commit comments

Comments
 (0)