Skip to content

Commit 41996e8

Browse files
ext/[cd]*: fix a bunch of typos (php#16298)
Only functional change is the renaming of the functions `dom_document_substitue_entities_(read|write)` to replace `substitue` with `substitute`.
1 parent e34eebb commit 41996e8

33 files changed

+37
-37
lines changed

ext/calendar/calendar.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ static char *heb_number_to_chars(int n, int fl, char **ret)
398398
n -= 400;
399399
}
400400

401-
/* meot (hundreads) case */
401+
/* meot (hundreds) case */
402402
if (n >= 100) {
403403
*p = alef_bet[18 + n / 100];
404404
p++;

ext/calendar/julian.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
* the Julian calendar.
6868
*
6969
* The details are unknown, but the lengths of the months were adjusted
70-
* until they finally stablized in 8 A.D. with their current lengths:
70+
* until they finally stabilized in 8 A.D. with their current lengths:
7171
*
7272
* January 31
7373
* February 28/29

ext/com_dotnet/tests/gh8778.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
Bug GH-8778 (Integer arithmethic with large number variants fails)
2+
Bug GH-8778 (Integer arithmetic with large number variants fails)
33
--EXTENSIONS--
44
com_dotnet
55
--SKIPIF--

ext/ctype/tests/ctype_xdigit_variation1.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
Test ctype_xdigit() function : usage variations - different data typse as $c arg
2+
Test ctype_xdigit() function : usage variations - different data types as $c arg
33
--EXTENSIONS--
44
ctype
55
--FILE--

ext/curl/interface.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161

6262
#ifdef __GNUC__
6363
/* don't complain about deprecated CURLOPT_* we're exposing to PHP; we
64-
need to keep using those to avoid breaking PHP API compatibiltiy */
64+
need to keep using those to avoid breaking PHP API compatibility */
6565
# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
6666
#endif
6767

ext/curl/tests/bug71144.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
Bug #71144 (Sementation fault when using cURL with ZTS)
2+
Bug #71144 (Segmentation fault when using cURL with ZTS)
33
--DESCRIPTION--
44
Since Curl 7.62, CURLOPT_DNS_USE_GLOBAL_CACHE has no effect, and is
55
silently ignored.

ext/curl/tests/curl_copy_handle_variation2.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Francesco Fullone ff@ideato.it
66
--EXTENSIONS--
77
curl
88
--DESCRIPTION--
9-
the only way to test if a option is setten on a curl handle is using the curl_getinfo() function.
9+
the only way to test if a option is set on a curl handle is using the curl_getinfo() function.
1010
but this can only check on a limited amount of options...
1111
--FILE--
1212
<?php

ext/curl/tests/curl_multi_setopt_callables.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
Test curl_multi_setopt() with options that take callabes
2+
Test curl_multi_setopt() with options that take callables
33
--EXTENSIONS--
44
curl
55
--FILE--

ext/curl/tests/curl_setopt_callables.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
Test curl_setopt(_array)() with options that take callabes
2+
Test curl_setopt(_array)() with options that take callables
33
--EXTENSIONS--
44
curl
55
--FILE--

ext/date/php_date.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2699,7 +2699,7 @@ PHP_METHOD(DateTime, createFromInterface)
26992699
}
27002700
/* }}} */
27012701

2702-
/* {{{ Creates new DateTime object from given unix timetamp */
2702+
/* {{{ Creates new DateTime object from given unix timestamp */
27032703
PHP_METHOD(DateTime, createFromTimestamp)
27042704
{
27052705
zval *value;

ext/date/tests/DateTimeZone_clone_basic1.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ if ($clone != $orig) {
2222
}else if ($clone === $orig) {
2323
echo "TEST FAILED : objects identical\n";
2424
} else {
25-
echo "TEST PASSED : Objects equal but not indetical\n";
25+
echo "TEST PASSED : Objects equal but not identical\n";
2626
}
2727

2828
?>
@@ -40,4 +40,4 @@ object(DateTimeZone)#%d (2) {
4040
["timezone"]=>
4141
string(3) "GMT"
4242
}
43-
TEST PASSED : Objects equal but not indetical
43+
TEST PASSED : Objects equal but not identical

ext/date/tests/DateTimeZone_serialize_type_1.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ var_dump($serialized);
1212

1313
$tz2 = unserialize($serialized);
1414
var_dump($tz2);
15-
// Try to use unserialzied object
15+
// Try to use unserialized object
1616
var_dump( $tz2->getName() );
1717

1818
?>

ext/date/tests/DateTimeZone_serialize_type_2.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ var_dump($serialized);
1212

1313
$tz2 = unserialize($serialized);
1414
var_dump($tz2);
15-
// Try to use unserialzied object
15+
// Try to use unserialized object
1616
var_dump( $tz2->getName() );
1717

1818
?>

ext/date/tests/DateTimeZone_serialize_type_3.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ var_dump($serialized);
1212

1313
$tz2 = unserialize($serialized);
1414
var_dump($tz2);
15-
// Try to use unserialzied object
15+
// Try to use unserialized object
1616
var_dump( $tz2->getName() );
1717

1818
?>

ext/date/tests/DateTime_serialize.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ var_dump($serialized);
1212

1313
$date2 = unserialize($serialized);
1414
var_dump($date2);
15-
// Try to use unserialzied object
15+
// Try to use unserialized object
1616
var_dump( $date2->format( "F j, Y, g:i a") );
1717

1818
?>

ext/date/tests/ExtendDateTime.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
Extendig DatTime and calling __set_state without args
2+
Extending DateTime and calling __set_state without args
33
--CREDITS--
44
Gabriel Caruso (carusogabriel34@gmail.com)
55
--FILE--

ext/date/tests/bug36224.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
Bug #36224 (date(DATE_ATOM) gives wrong resulsts)
2+
Bug #36224 (date(DATE_ATOM) gives wrong results)
33
--FILE--
44
<?php
55
date_default_timezone_set("Europe/Oslo");

ext/date/tests/date_isodate_set_basic1.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ echo "*** Testing date_isodate_set() : basic functionality ***\n";
77
//Set the default time zone
88
date_default_timezone_set("Europe/London");
99

10-
// Create a deate object
10+
// Create a date object
1111
$datetime = date_create("2009-01-30 17:57:32");
1212

1313
// Which month is week 40 ?

ext/date/tests/getdate_variation4.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
Test getdate() function : usage variation - Verifyig by supplying year-wise sample time stamps since Unix epoch time
2+
Test getdate() function : usage variation - Verifying by supplying year-wise sample time stamps since Unix epoch time
33
--FILE--
44
<?php
55
echo "*** Testing getdate() : usage variation ***\n";

ext/date/tests/getdate_variation5.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
Test getdate() function : usage variation - Verifyig with different timezones on Unix epoch timestamp
2+
Test getdate() function : usage variation - Verifying with different timezones on Unix epoch timestamp
33
--FILE--
44
<?php
55
echo "*** Testing getdate() : usage variation ***\n";

ext/dba/dba.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1191,7 +1191,7 @@ PHP_FUNCTION(dba_delete)
11911191
/* }}} */
11921192

11931193
/* {{{ If not inifile: Insert value as key, return false, if key exists already
1194-
If inifile: Add vakue as key (next instance of key) */
1194+
If inifile: Add value as key (next instance of key) */
11951195
PHP_FUNCTION(dba_insert)
11961196
{
11971197
php_dba_update(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);

ext/dom/document.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -349,14 +349,14 @@ zend_result dom_document_recover_write(dom_object *obj, zval *newval)
349349
/* {{{ substituteEntities boolean
350350
readonly=no
351351
*/
352-
zend_result dom_document_substitue_entities_read(dom_object *obj, zval *retval)
352+
zend_result dom_document_substitute_entities_read(dom_object *obj, zval *retval)
353353
{
354354
libxml_doc_props const* doc_prop = dom_get_doc_props_read_only(obj->document);
355355
ZVAL_BOOL(retval, doc_prop->substituteentities);
356356
return SUCCESS;
357357
}
358358

359-
zend_result dom_document_substitue_entities_write(dom_object *obj, zval *newval)
359+
zend_result dom_document_substitute_entities_write(dom_object *obj, zval *newval)
360360
{
361361
if (obj->document) {
362362
dom_doc_propsptr doc_prop = dom_get_doc_props(obj->document);

ext/dom/dom_properties.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ zend_result dom_document_preserve_whitespace_read(dom_object *obj, zval *retval)
5858
zend_result dom_document_preserve_whitespace_write(dom_object *obj, zval *newval);
5959
zend_result dom_document_recover_read(dom_object *obj, zval *retval);
6060
zend_result dom_document_recover_write(dom_object *obj, zval *newval);
61-
zend_result dom_document_substitue_entities_read(dom_object *obj, zval *retval);
62-
zend_result dom_document_substitue_entities_write(dom_object *obj, zval *newval);
61+
zend_result dom_document_substitute_entities_read(dom_object *obj, zval *retval);
62+
zend_result dom_document_substitute_entities_write(dom_object *obj, zval *newval);
6363

6464
/* html5 document properties */
6565
zend_result dom_html_document_encoding_write(dom_object *obj, zval *retval);

ext/dom/element.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1747,7 +1747,7 @@ PHP_METHOD(DOMElement, toggleAttribute)
17471747
if (follow_spec) {
17481748
xmlSetNsProp(thisp, NULL, BAD_CAST qname, NULL);
17491749
} else {
1750-
/* The behaviour for namespaces isn't defined by spec, but this is based on observing browers behaviour.
1750+
/* The behaviour for namespaces isn't defined by spec, but this is based on observing browsers' behaviour.
17511751
* It follows the same rules when you'd manually add an attribute using the other APIs. */
17521752
int len;
17531753
const xmlChar *split = xmlSplitQName3((const xmlChar *) qname, &len);

ext/dom/infra.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ zend_string *dom_strip_and_collapse_ascii_whitespace(zend_string *input)
4646
while (current < end) {
4747
/* Copy non-whitespace */
4848
size_t non_whitespace_len = strcspn(current, ascii_whitespace);
49-
/* If the pointers are equal, we still haven't encountered collapsable or strippable whitespace. */
49+
/* If the pointers are equal, we still haven't encountered collapsible or strippable whitespace. */
5050
if (write_ptr != current) {
5151
memmove(write_ptr, current, non_whitespace_len);
5252
}

ext/dom/php_dom.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -960,7 +960,7 @@ PHP_MINIT_FUNCTION(dom)
960960
DOM_REGISTER_PROP_HANDLER(&dom_document_prop_handlers, "resolveExternals", dom_document_resolve_externals_read, dom_document_resolve_externals_write);
961961
DOM_REGISTER_PROP_HANDLER(&dom_document_prop_handlers, "preserveWhiteSpace", dom_document_preserve_whitespace_read, dom_document_preserve_whitespace_write);
962962
DOM_REGISTER_PROP_HANDLER(&dom_document_prop_handlers, "recover", dom_document_recover_read, dom_document_recover_write);
963-
DOM_REGISTER_PROP_HANDLER(&dom_document_prop_handlers, "substituteEntities", dom_document_substitue_entities_read, dom_document_substitue_entities_write);
963+
DOM_REGISTER_PROP_HANDLER(&dom_document_prop_handlers, "substituteEntities", dom_document_substitute_entities_read, dom_document_substitute_entities_write);
964964
DOM_REGISTER_PROP_HANDLER(&dom_document_prop_handlers, "firstElementChild", dom_parent_node_first_element_child_read, NULL);
965965
DOM_REGISTER_PROP_HANDLER(&dom_document_prop_handlers, "lastElementChild", dom_parent_node_last_element_child_read, NULL);
966966
DOM_REGISTER_PROP_HANDLER(&dom_document_prop_handlers, "childElementCount", dom_parent_node_child_element_count, NULL);
@@ -2095,7 +2095,7 @@ int dom_validate_and_extract(const zend_string *namespace, const zend_string *qn
20952095
*localName = xmlSplitQName2(BAD_CAST ZSTR_VAL(qname), prefix);
20962096

20972097
/* 6. If prefix is non-null and namespace is null, then throw a "NamespaceError" DOMException.
2098-
* Note that null namespace means empty string here becaue of step 1. */
2098+
* Note that null namespace means empty string here because of step 1. */
20992099
if (*prefix != NULL && ZSTR_VAL(namespace)[0] == '\0') {
21002100
return NAMESPACE_ERR;
21012101
}

ext/dom/tests/DOMDocument_saveHTML_variant2.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
DOMDocument::saveHTML() vs DOMDocumet::saveXML()
2+
DOMDocument::saveHTML() vs DOMDocument::saveXML()
33
--EXTENSIONS--
44
dom
55
--FILE--

ext/dom/tests/bug69846.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
Bug #69846 Segmenation fault (access violation) when iterating over DOMNodeList
2+
Bug #69846 Segmentation fault (access violation) when iterating over DOMNodeList
33
--EXTENSIONS--
44
dom
55
--FILE--

ext/dom/tests/bug79968.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
dom: Bug #79968 - Crash when calling before without valid hierachy
2+
dom: Bug #79968 - Crash when calling before without valid hierarchy
33
--EXTENSIONS--
44
dom
55
--FILE--

ext/dom/tests/modern/spec/gh11404_1.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
GH-11404 (DOMDocument::savexml and friends ommit xmlns="" declaration for null namespace, creating incorrect xml representation of the DOM)
2+
GH-11404 (DOMDocument::savexml and friends omit xmlns="" declaration for null namespace, creating incorrect xml representation of the DOM)
33
--EXTENSIONS--
44
dom
55
--FILE--

ext/dom/tests/modern/spec/gh11404_2.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
GH-11404 (DOMDocument::savexml and friends ommit xmlns="" declaration for null namespace, creating incorrect xml representation of the DOM)
2+
GH-11404 (DOMDocument::savexml and friends omit xmlns="" declaration for null namespace, creating incorrect xml representation of the DOM)
33
--EXTENSIONS--
44
dom
55
--FILE--

ext/dom/xpath.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ static void php_xpath_eval(INTERNAL_FUNCTION_PARAMETERS, int type, bool modern)
353353
xmlNsPtr original = (xmlNsPtr) node;
354354

355355
/* Make sure parent dom object exists, so we can take an extra reference. */
356-
zval parent_zval; /* don't destroy me, my lifetime is transfered to the fake namespace decl */
356+
zval parent_zval; /* don't destroy me, my lifetime is transferred to the fake namespace decl */
357357
php_dom_create_object(nsparent, &parent_zval, &intern->dom);
358358
dom_object *parent_intern = Z_DOMOBJ_P(&parent_zval);
359359

ext/dom/xpath_callbacks.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ static zval *php_dom_xpath_callback_fetch_args(xmlXPathParserContextPtr ctxt, ui
350350
xmlNsPtr original = (xmlNsPtr) node;
351351

352352
/* Make sure parent dom object exists, so we can take an extra reference. */
353-
zval parent_zval; /* don't destroy me, my lifetime is transfered to the fake namespace decl */
353+
zval parent_zval; /* don't destroy me, my lifetime is transferred to the fake namespace decl */
354354
php_dom_create_object(nsparent, &parent_zval, intern);
355355
dom_object *parent_intern = Z_DOMOBJ_P(&parent_zval);
356356

0 commit comments

Comments
 (0)