ext/[cd]*: fix a bunch of typos (#16298)

Only functional change is the renaming of the functions
`dom_document_substitue_entities_(read|write)` to replace `substitue` with
`substitute`.
This commit is contained in:
DanielEScherzer 2024-10-09 08:40:42 -07:00 committed by GitHub
parent e34eebb854
commit 41996e8d4f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
33 changed files with 37 additions and 37 deletions

View file

@ -398,7 +398,7 @@ static char *heb_number_to_chars(int n, int fl, char **ret)
n -= 400; n -= 400;
} }
/* meot (hundreads) case */ /* meot (hundreds) case */
if (n >= 100) { if (n >= 100) {
*p = alef_bet[18 + n / 100]; *p = alef_bet[18 + n / 100];
p++; p++;

View file

@ -67,7 +67,7 @@
* the Julian calendar. * the Julian calendar.
* *
* The details are unknown, but the lengths of the months were adjusted * The details are unknown, but the lengths of the months were adjusted
* until they finally stablized in 8 A.D. with their current lengths: * until they finally stabilized in 8 A.D. with their current lengths:
* *
* January 31 * January 31
* February 28/29 * February 28/29

View file

@ -1,5 +1,5 @@
--TEST-- --TEST--
Bug GH-8778 (Integer arithmethic with large number variants fails) Bug GH-8778 (Integer arithmetic with large number variants fails)
--EXTENSIONS-- --EXTENSIONS--
com_dotnet com_dotnet
--SKIPIF-- --SKIPIF--

View file

@ -1,5 +1,5 @@
--TEST-- --TEST--
Test ctype_xdigit() function : usage variations - different data typse as $c arg Test ctype_xdigit() function : usage variations - different data types as $c arg
--EXTENSIONS-- --EXTENSIONS--
ctype ctype
--FILE-- --FILE--

View file

@ -61,7 +61,7 @@
#ifdef __GNUC__ #ifdef __GNUC__
/* don't complain about deprecated CURLOPT_* we're exposing to PHP; we /* don't complain about deprecated CURLOPT_* we're exposing to PHP; we
need to keep using those to avoid breaking PHP API compatibiltiy */ need to keep using those to avoid breaking PHP API compatibility */
# pragma GCC diagnostic ignored "-Wdeprecated-declarations" # pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif #endif

View file

@ -1,5 +1,5 @@
--TEST-- --TEST--
Bug #71144 (Sementation fault when using cURL with ZTS) Bug #71144 (Segmentation fault when using cURL with ZTS)
--DESCRIPTION-- --DESCRIPTION--
Since Curl 7.62, CURLOPT_DNS_USE_GLOBAL_CACHE has no effect, and is Since Curl 7.62, CURLOPT_DNS_USE_GLOBAL_CACHE has no effect, and is
silently ignored. silently ignored.

View file

@ -6,7 +6,7 @@ Francesco Fullone ff@ideato.it
--EXTENSIONS-- --EXTENSIONS--
curl curl
--DESCRIPTION-- --DESCRIPTION--
the only way to test if a option is setten on a curl handle is using the curl_getinfo() function. the only way to test if a option is set on a curl handle is using the curl_getinfo() function.
but this can only check on a limited amount of options... but this can only check on a limited amount of options...
--FILE-- --FILE--
<?php <?php

View file

@ -1,5 +1,5 @@
--TEST-- --TEST--
Test curl_multi_setopt() with options that take callabes Test curl_multi_setopt() with options that take callables
--EXTENSIONS-- --EXTENSIONS--
curl curl
--FILE-- --FILE--

View file

@ -1,5 +1,5 @@
--TEST-- --TEST--
Test curl_setopt(_array)() with options that take callabes Test curl_setopt(_array)() with options that take callables
--EXTENSIONS-- --EXTENSIONS--
curl curl
--FILE-- --FILE--

View file

@ -2699,7 +2699,7 @@ PHP_METHOD(DateTime, createFromInterface)
} }
/* }}} */ /* }}} */
/* {{{ Creates new DateTime object from given unix timetamp */ /* {{{ Creates new DateTime object from given unix timestamp */
PHP_METHOD(DateTime, createFromTimestamp) PHP_METHOD(DateTime, createFromTimestamp)
{ {
zval *value; zval *value;

View file

@ -22,7 +22,7 @@ if ($clone != $orig) {
}else if ($clone === $orig) { }else if ($clone === $orig) {
echo "TEST FAILED : objects identical\n"; echo "TEST FAILED : objects identical\n";
} else { } else {
echo "TEST PASSED : Objects equal but not indetical\n"; echo "TEST PASSED : Objects equal but not identical\n";
} }
?> ?>
@ -40,4 +40,4 @@ object(DateTimeZone)#%d (2) {
["timezone"]=> ["timezone"]=>
string(3) "GMT" string(3) "GMT"
} }
TEST PASSED : Objects equal but not indetical TEST PASSED : Objects equal but not identical

View file

@ -12,7 +12,7 @@ var_dump($serialized);
$tz2 = unserialize($serialized); $tz2 = unserialize($serialized);
var_dump($tz2); var_dump($tz2);
// Try to use unserialzied object // Try to use unserialized object
var_dump( $tz2->getName() ); var_dump( $tz2->getName() );
?> ?>

View file

@ -12,7 +12,7 @@ var_dump($serialized);
$tz2 = unserialize($serialized); $tz2 = unserialize($serialized);
var_dump($tz2); var_dump($tz2);
// Try to use unserialzied object // Try to use unserialized object
var_dump( $tz2->getName() ); var_dump( $tz2->getName() );
?> ?>

View file

@ -12,7 +12,7 @@ var_dump($serialized);
$tz2 = unserialize($serialized); $tz2 = unserialize($serialized);
var_dump($tz2); var_dump($tz2);
// Try to use unserialzied object // Try to use unserialized object
var_dump( $tz2->getName() ); var_dump( $tz2->getName() );
?> ?>

View file

@ -12,7 +12,7 @@ var_dump($serialized);
$date2 = unserialize($serialized); $date2 = unserialize($serialized);
var_dump($date2); var_dump($date2);
// Try to use unserialzied object // Try to use unserialized object
var_dump( $date2->format( "F j, Y, g:i a") ); var_dump( $date2->format( "F j, Y, g:i a") );
?> ?>

View file

@ -1,5 +1,5 @@
--TEST-- --TEST--
Extendig DatTime and calling __set_state without args Extending DateTime and calling __set_state without args
--CREDITS-- --CREDITS--
Gabriel Caruso (carusogabriel34@gmail.com) Gabriel Caruso (carusogabriel34@gmail.com)
--FILE-- --FILE--

View file

@ -1,5 +1,5 @@
--TEST-- --TEST--
Bug #36224 (date(DATE_ATOM) gives wrong resulsts) Bug #36224 (date(DATE_ATOM) gives wrong results)
--FILE-- --FILE--
<?php <?php
date_default_timezone_set("Europe/Oslo"); date_default_timezone_set("Europe/Oslo");

View file

@ -7,7 +7,7 @@ echo "*** Testing date_isodate_set() : basic functionality ***\n";
//Set the default time zone //Set the default time zone
date_default_timezone_set("Europe/London"); date_default_timezone_set("Europe/London");
// Create a deate object // Create a date object
$datetime = date_create("2009-01-30 17:57:32"); $datetime = date_create("2009-01-30 17:57:32");
// Which month is week 40 ? // Which month is week 40 ?

View file

@ -1,5 +1,5 @@
--TEST-- --TEST--
Test getdate() function : usage variation - Verifyig by supplying year-wise sample time stamps since Unix epoch time Test getdate() function : usage variation - Verifying by supplying year-wise sample time stamps since Unix epoch time
--FILE-- --FILE--
<?php <?php
echo "*** Testing getdate() : usage variation ***\n"; echo "*** Testing getdate() : usage variation ***\n";

View file

@ -1,5 +1,5 @@
--TEST-- --TEST--
Test getdate() function : usage variation - Verifyig with different timezones on Unix epoch timestamp Test getdate() function : usage variation - Verifying with different timezones on Unix epoch timestamp
--FILE-- --FILE--
<?php <?php
echo "*** Testing getdate() : usage variation ***\n"; echo "*** Testing getdate() : usage variation ***\n";

View file

@ -1191,7 +1191,7 @@ PHP_FUNCTION(dba_delete)
/* }}} */ /* }}} */
/* {{{ If not inifile: Insert value as key, return false, if key exists already /* {{{ If not inifile: Insert value as key, return false, if key exists already
If inifile: Add vakue as key (next instance of key) */ If inifile: Add value as key (next instance of key) */
PHP_FUNCTION(dba_insert) PHP_FUNCTION(dba_insert)
{ {
php_dba_update(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); php_dba_update(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);

View file

@ -349,14 +349,14 @@ zend_result dom_document_recover_write(dom_object *obj, zval *newval)
/* {{{ substituteEntities boolean /* {{{ substituteEntities boolean
readonly=no readonly=no
*/ */
zend_result dom_document_substitue_entities_read(dom_object *obj, zval *retval) zend_result dom_document_substitute_entities_read(dom_object *obj, zval *retval)
{ {
libxml_doc_props const* doc_prop = dom_get_doc_props_read_only(obj->document); libxml_doc_props const* doc_prop = dom_get_doc_props_read_only(obj->document);
ZVAL_BOOL(retval, doc_prop->substituteentities); ZVAL_BOOL(retval, doc_prop->substituteentities);
return SUCCESS; return SUCCESS;
} }
zend_result dom_document_substitue_entities_write(dom_object *obj, zval *newval) zend_result dom_document_substitute_entities_write(dom_object *obj, zval *newval)
{ {
if (obj->document) { if (obj->document) {
dom_doc_propsptr doc_prop = dom_get_doc_props(obj->document); dom_doc_propsptr doc_prop = dom_get_doc_props(obj->document);

View file

@ -58,8 +58,8 @@ zend_result dom_document_preserve_whitespace_read(dom_object *obj, zval *retval)
zend_result dom_document_preserve_whitespace_write(dom_object *obj, zval *newval); zend_result dom_document_preserve_whitespace_write(dom_object *obj, zval *newval);
zend_result dom_document_recover_read(dom_object *obj, zval *retval); zend_result dom_document_recover_read(dom_object *obj, zval *retval);
zend_result dom_document_recover_write(dom_object *obj, zval *newval); zend_result dom_document_recover_write(dom_object *obj, zval *newval);
zend_result dom_document_substitue_entities_read(dom_object *obj, zval *retval); zend_result dom_document_substitute_entities_read(dom_object *obj, zval *retval);
zend_result dom_document_substitue_entities_write(dom_object *obj, zval *newval); zend_result dom_document_substitute_entities_write(dom_object *obj, zval *newval);
/* html5 document properties */ /* html5 document properties */
zend_result dom_html_document_encoding_write(dom_object *obj, zval *retval); zend_result dom_html_document_encoding_write(dom_object *obj, zval *retval);

View file

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

View file

@ -46,7 +46,7 @@ zend_string *dom_strip_and_collapse_ascii_whitespace(zend_string *input)
while (current < end) { while (current < end) {
/* Copy non-whitespace */ /* Copy non-whitespace */
size_t non_whitespace_len = strcspn(current, ascii_whitespace); size_t non_whitespace_len = strcspn(current, ascii_whitespace);
/* If the pointers are equal, we still haven't encountered collapsable or strippable whitespace. */ /* If the pointers are equal, we still haven't encountered collapsible or strippable whitespace. */
if (write_ptr != current) { if (write_ptr != current) {
memmove(write_ptr, current, non_whitespace_len); memmove(write_ptr, current, non_whitespace_len);
} }

View file

@ -960,7 +960,7 @@ PHP_MINIT_FUNCTION(dom)
DOM_REGISTER_PROP_HANDLER(&dom_document_prop_handlers, "resolveExternals", dom_document_resolve_externals_read, dom_document_resolve_externals_write); DOM_REGISTER_PROP_HANDLER(&dom_document_prop_handlers, "resolveExternals", dom_document_resolve_externals_read, dom_document_resolve_externals_write);
DOM_REGISTER_PROP_HANDLER(&dom_document_prop_handlers, "preserveWhiteSpace", dom_document_preserve_whitespace_read, dom_document_preserve_whitespace_write); DOM_REGISTER_PROP_HANDLER(&dom_document_prop_handlers, "preserveWhiteSpace", dom_document_preserve_whitespace_read, dom_document_preserve_whitespace_write);
DOM_REGISTER_PROP_HANDLER(&dom_document_prop_handlers, "recover", dom_document_recover_read, dom_document_recover_write); DOM_REGISTER_PROP_HANDLER(&dom_document_prop_handlers, "recover", dom_document_recover_read, dom_document_recover_write);
DOM_REGISTER_PROP_HANDLER(&dom_document_prop_handlers, "substituteEntities", dom_document_substitue_entities_read, dom_document_substitue_entities_write); DOM_REGISTER_PROP_HANDLER(&dom_document_prop_handlers, "substituteEntities", dom_document_substitute_entities_read, dom_document_substitute_entities_write);
DOM_REGISTER_PROP_HANDLER(&dom_document_prop_handlers, "firstElementChild", dom_parent_node_first_element_child_read, NULL); DOM_REGISTER_PROP_HANDLER(&dom_document_prop_handlers, "firstElementChild", dom_parent_node_first_element_child_read, NULL);
DOM_REGISTER_PROP_HANDLER(&dom_document_prop_handlers, "lastElementChild", dom_parent_node_last_element_child_read, NULL); DOM_REGISTER_PROP_HANDLER(&dom_document_prop_handlers, "lastElementChild", dom_parent_node_last_element_child_read, NULL);
DOM_REGISTER_PROP_HANDLER(&dom_document_prop_handlers, "childElementCount", dom_parent_node_child_element_count, NULL); 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
*localName = xmlSplitQName2(BAD_CAST ZSTR_VAL(qname), prefix); *localName = xmlSplitQName2(BAD_CAST ZSTR_VAL(qname), prefix);
/* 6. If prefix is non-null and namespace is null, then throw a "NamespaceError" DOMException. /* 6. If prefix is non-null and namespace is null, then throw a "NamespaceError" DOMException.
* Note that null namespace means empty string here becaue of step 1. */ * Note that null namespace means empty string here because of step 1. */
if (*prefix != NULL && ZSTR_VAL(namespace)[0] == '\0') { if (*prefix != NULL && ZSTR_VAL(namespace)[0] == '\0') {
return NAMESPACE_ERR; return NAMESPACE_ERR;
} }

View file

@ -1,5 +1,5 @@
--TEST-- --TEST--
DOMDocument::saveHTML() vs DOMDocumet::saveXML() DOMDocument::saveHTML() vs DOMDocument::saveXML()
--EXTENSIONS-- --EXTENSIONS--
dom dom
--FILE-- --FILE--

View file

@ -1,5 +1,5 @@
--TEST-- --TEST--
Bug #69846 Segmenation fault (access violation) when iterating over DOMNodeList Bug #69846 Segmentation fault (access violation) when iterating over DOMNodeList
--EXTENSIONS-- --EXTENSIONS--
dom dom
--FILE-- --FILE--

View file

@ -1,5 +1,5 @@
--TEST-- --TEST--
dom: Bug #79968 - Crash when calling before without valid hierachy dom: Bug #79968 - Crash when calling before without valid hierarchy
--EXTENSIONS-- --EXTENSIONS--
dom dom
--FILE-- --FILE--

View file

@ -1,5 +1,5 @@
--TEST-- --TEST--
GH-11404 (DOMDocument::savexml and friends ommit xmlns="" declaration for null namespace, creating incorrect xml representation of the DOM) GH-11404 (DOMDocument::savexml and friends omit xmlns="" declaration for null namespace, creating incorrect xml representation of the DOM)
--EXTENSIONS-- --EXTENSIONS--
dom dom
--FILE-- --FILE--

View file

@ -1,5 +1,5 @@
--TEST-- --TEST--
GH-11404 (DOMDocument::savexml and friends ommit xmlns="" declaration for null namespace, creating incorrect xml representation of the DOM) GH-11404 (DOMDocument::savexml and friends omit xmlns="" declaration for null namespace, creating incorrect xml representation of the DOM)
--EXTENSIONS-- --EXTENSIONS--
dom dom
--FILE-- --FILE--

View file

@ -353,7 +353,7 @@ static void php_xpath_eval(INTERNAL_FUNCTION_PARAMETERS, int type, bool modern)
xmlNsPtr original = (xmlNsPtr) node; xmlNsPtr original = (xmlNsPtr) node;
/* Make sure parent dom object exists, so we can take an extra reference. */ /* Make sure parent dom object exists, so we can take an extra reference. */
zval parent_zval; /* don't destroy me, my lifetime is transfered to the fake namespace decl */ zval parent_zval; /* don't destroy me, my lifetime is transferred to the fake namespace decl */
php_dom_create_object(nsparent, &parent_zval, &intern->dom); php_dom_create_object(nsparent, &parent_zval, &intern->dom);
dom_object *parent_intern = Z_DOMOBJ_P(&parent_zval); dom_object *parent_intern = Z_DOMOBJ_P(&parent_zval);

View file

@ -350,7 +350,7 @@ static zval *php_dom_xpath_callback_fetch_args(xmlXPathParserContextPtr ctxt, ui
xmlNsPtr original = (xmlNsPtr) node; xmlNsPtr original = (xmlNsPtr) node;
/* Make sure parent dom object exists, so we can take an extra reference. */ /* Make sure parent dom object exists, so we can take an extra reference. */
zval parent_zval; /* don't destroy me, my lifetime is transfered to the fake namespace decl */ zval parent_zval; /* don't destroy me, my lifetime is transferred to the fake namespace decl */
php_dom_create_object(nsparent, &parent_zval, intern); php_dom_create_object(nsparent, &parent_zval, intern);
dom_object *parent_intern = Z_DOMOBJ_P(&parent_zval); dom_object *parent_intern = Z_DOMOBJ_P(&parent_zval);