Skip to content

Commit f905a81

Browse files
beberleibeberlei
committed
ext/dom: Replace usages of PHP_FUNCTION and aliases with PHP_METHOD.
1 parent ee80567 commit f905a81

File tree

10 files changed

+228
-238
lines changed

10 files changed

+228
-238
lines changed

‎ext/dom/attr.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
*/
3535

3636
const zend_function_entry php_dom_attr_class_functions[] = {
37-
PHP_FALIAS(isId, dom_attr_is_id, arginfo_class_DOMAttr_isId)
37+
PHP_ME(domattr, isId, arginfo_class_DOMAttr_isId, ZEND_ACC_PUBLIC)
3838
PHP_ME(domattr, __construct, arginfo_class_DOMAttr___construct, ZEND_ACC_PUBLIC)
3939
PHP_FE_END
4040
};
@@ -209,11 +209,11 @@ int dom_attr_schema_type_info_read(dom_object *obj, zval *retval)
209209

210210
/* }}} */
211211

212-
/* {{{ proto bool dom_attr_is_id()
212+
/* {{{ proto bool domattr::isId()
213213
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Attr-isId
214214
Since: DOM Level 3
215215
*/
216-
PHP_FUNCTION(dom_attr_is_id)
216+
PHP_METHOD(domattr, isId)
217217
{
218218
zval *id;
219219
dom_object *intern;

‎ext/dom/characterdata.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@
3232
*/
3333

3434
const zend_function_entry php_dom_characterdata_class_functions[] = {
35-
PHP_FALIAS(substringData, dom_characterdata_substring_data, arginfo_class_DOMCharacterData_substringData)
36-
PHP_FALIAS(appendData, dom_characterdata_append_data, arginfo_class_DOMCharacterData_appendData)
37-
PHP_FALIAS(insertData, dom_characterdata_insert_data, arginfo_class_DOMCharacterData_insertData)
38-
PHP_FALIAS(deleteData, dom_characterdata_delete_data, arginfo_class_DOMCharacterData_deleteData)
39-
PHP_FALIAS(replaceData, dom_characterdata_replace_data, arginfo_class_DOMCharacterData_replaceData)
35+
PHP_ME(domcharacterdata, substringData, arginfo_class_DOMCharacterData_substringData, ZEND_ACC_PUBLIC)
36+
PHP_ME(domcharacterdata, appendData, arginfo_class_DOMCharacterData_appendData, ZEND_ACC_PUBLIC)
37+
PHP_ME(domcharacterdata, insertData, arginfo_class_DOMCharacterData_insertData, ZEND_ACC_PUBLIC)
38+
PHP_ME(domcharacterdata, deleteData, arginfo_class_DOMCharacterData_deleteData, ZEND_ACC_PUBLIC)
39+
PHP_ME(domcharacterdata, replaceData, arginfo_class_DOMCharacterData_replaceData, ZEND_ACC_PUBLIC)
4040
PHP_FE_END
4141
};
4242

@@ -122,7 +122,7 @@ int dom_characterdata_length_read(dom_object *obj, zval *retval)
122122
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-6531BCCF
123123
Since:
124124
*/
125-
PHP_FUNCTION(dom_characterdata_substring_data)
125+
PHP_METHOD(domcharacterdata, substringData)
126126
{
127127
zval *id;
128128
xmlChar *cur;
@@ -172,7 +172,7 @@ PHP_FUNCTION(dom_characterdata_substring_data)
172172
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-32791A2F
173173
Since:
174174
*/
175-
PHP_FUNCTION(dom_characterdata_append_data)
175+
PHP_METHOD(domcharacterdata, appendData)
176176
{
177177
zval *id;
178178
xmlNode *nodep;
@@ -195,7 +195,7 @@ PHP_FUNCTION(dom_characterdata_append_data)
195195
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-3EDB695F
196196
Since:
197197
*/
198-
PHP_FUNCTION(dom_characterdata_insert_data)
198+
PHP_METHOD(domcharacterdata, insertData)
199199
{
200200
zval *id;
201201
xmlChar *cur, *first, *second;
@@ -245,7 +245,7 @@ PHP_FUNCTION(dom_characterdata_insert_data)
245245
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-7C603781
246246
Since:
247247
*/
248-
PHP_FUNCTION(dom_characterdata_delete_data)
248+
PHP_METHOD(domcharacterdata, deleteData)
249249
{
250250
zval *id;
251251
xmlChar *cur, *substring, *second;
@@ -301,7 +301,7 @@ PHP_FUNCTION(dom_characterdata_delete_data)
301301
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-E5CBA7FB
302302
Since:
303303
*/
304-
PHP_FUNCTION(dom_characterdata_replace_data)
304+
PHP_METHOD(domcharacterdata, replaceData)
305305
{
306306
zval *id;
307307
xmlChar *cur, *substring, *second = NULL;

‎ext/dom/document.c

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -46,40 +46,40 @@ struct _idsIterator {
4646
*/
4747

4848
const zend_function_entry php_dom_document_class_functions[] = { /* {{{ */
49-
PHP_FALIAS(createElement, dom_document_create_element, arginfo_class_DOMDocument_createElement)
50-
PHP_FALIAS(createDocumentFragment, dom_document_create_document_fragment, arginfo_class_DOMDocument_createDocumentFragment)
51-
PHP_FALIAS(createTextNode, dom_document_create_text_node, arginfo_class_DOMDocument_createTextNode)
52-
PHP_FALIAS(createComment, dom_document_create_comment, arginfo_class_DOMDocument_createComment)
53-
PHP_FALIAS(createCDATASection, dom_document_create_cdatasection, arginfo_class_DOMDocument_createCDATASection)
54-
PHP_FALIAS(createProcessingInstruction, dom_document_create_processing_instruction, arginfo_class_DOMDocument_createProcessingInstruction)
55-
PHP_FALIAS(createAttribute, dom_document_create_attribute, arginfo_class_DOMDocument_createAttribute)
56-
PHP_FALIAS(createEntityReference, dom_document_create_entity_reference, arginfo_class_DOMDocument_createEntityReference)
57-
PHP_FALIAS(getElementsByTagName, dom_document_get_elements_by_tag_name, arginfo_class_DOMDocument_getElementsByTagName)
58-
PHP_FALIAS(importNode, dom_document_import_node, arginfo_class_DOMDocument_importNode)
59-
PHP_FALIAS(createElementNS, dom_document_create_element_ns, arginfo_class_DOMDocument_createElementNS)
60-
PHP_FALIAS(createAttributeNS, dom_document_create_attribute_ns, arginfo_class_DOMDocument_createAttributeNS)
61-
PHP_FALIAS(getElementsByTagNameNS, dom_document_get_elements_by_tag_name_ns, arginfo_class_DOMDocument_getElementsByTagNameNS)
62-
PHP_FALIAS(getElementById, dom_document_get_element_by_id, arginfo_class_DOMDocument_getElementById)
63-
PHP_FALIAS(adoptNode, dom_document_adopt_node, arginfo_class_DOMDocument_adoptNode)
64-
PHP_FALIAS(normalizeDocument, dom_document_normalize_document, arginfo_class_DOMDocument_normalizeDocument)
49+
PHP_ME(domdocument, createElement, arginfo_class_DOMDocument_createElement, ZEND_ACC_PUBLIC)
50+
PHP_ME(domdocument, createDocumentFragment, arginfo_class_DOMDocument_createDocumentFragment, ZEND_ACC_PUBLIC)
51+
PHP_ME(domdocument, createTextNode, arginfo_class_DOMDocument_createTextNode, ZEND_ACC_PUBLIC)
52+
PHP_ME(domdocument, createComment, arginfo_class_DOMDocument_createComment, ZEND_ACC_PUBLIC)
53+
PHP_ME(domdocument, createCDATASection, arginfo_class_DOMDocument_createCDATASection, ZEND_ACC_PUBLIC)
54+
PHP_ME(domdocument, createProcessingInstruction, arginfo_class_DOMDocument_createProcessingInstruction, ZEND_ACC_PUBLIC)
55+
PHP_ME(domdocument, createAttribute, arginfo_class_DOMDocument_createAttribute, ZEND_ACC_PUBLIC)
56+
PHP_ME(domdocument, createEntityReference, arginfo_class_DOMDocument_createEntityReference, ZEND_ACC_PUBLIC)
57+
PHP_ME(domdocument, getElementsByTagName, arginfo_class_DOMDocument_getElementsByTagName, ZEND_ACC_PUBLIC)
58+
PHP_ME(domdocument, importNode, arginfo_class_DOMDocument_importNode, ZEND_ACC_PUBLIC)
59+
PHP_ME(domdocument, createElementNS, arginfo_class_DOMDocument_createElementNS, ZEND_ACC_PUBLIC)
60+
PHP_ME(domdocument, createAttributeNS, arginfo_class_DOMDocument_createAttributeNS, ZEND_ACC_PUBLIC)
61+
PHP_ME(domdocument, getElementsByTagNameNS, arginfo_class_DOMDocument_getElementsByTagNameNS, ZEND_ACC_PUBLIC)
62+
PHP_ME(domdocument, getElementById, arginfo_class_DOMDocument_getElementById, ZEND_ACC_PUBLIC)
63+
PHP_ME(domdocument, adoptNode, arginfo_class_DOMDocument_adoptNode, ZEND_ACC_PUBLIC)
64+
PHP_ME(domdocument, normalizeDocument, arginfo_class_DOMDocument_normalizeDocument, ZEND_ACC_PUBLIC)
6565
PHP_ME(domdocument, load, arginfo_class_DOMDocument_load, ZEND_ACC_PUBLIC)
66-
PHP_FALIAS(save, dom_document_save, arginfo_class_DOMDocument_save)
66+
PHP_ME(domdocument, save, arginfo_class_DOMDocument_save, ZEND_ACC_PUBLIC)
6767
PHP_ME(domdocument, loadXML, arginfo_class_DOMDocument_loadXML, ZEND_ACC_PUBLIC)
68-
PHP_FALIAS(saveXML, dom_document_savexml, arginfo_class_DOMDocument_saveXML)
68+
PHP_ME(domdocument, saveXML, arginfo_class_DOMDocument_saveXML, ZEND_ACC_PUBLIC)
6969
PHP_ME(domdocument, __construct, arginfo_class_DOMDocument___construct, ZEND_ACC_PUBLIC)
70-
PHP_FALIAS(validate, dom_document_validate, arginfo_class_DOMDocument_validate)
71-
PHP_FALIAS(xinclude, dom_document_xinclude, arginfo_class_DOMDocument_xinclude)
70+
PHP_ME(domdocument, validate, arginfo_class_DOMDocument_validate, ZEND_ACC_PUBLIC)
71+
PHP_ME(domdocument, xinclude, arginfo_class_DOMDocument_xinclude, ZEND_ACC_PUBLIC)
7272
#if defined(LIBXML_HTML_ENABLED)
7373
PHP_ME(domdocument, loadHTML, arginfo_class_DOMDocument_loadHTML, ZEND_ACC_PUBLIC)
7474
PHP_ME(domdocument, loadHTMLFile, arginfo_class_DOMDocument_loadHTMLFile, ZEND_ACC_PUBLIC)
75-
PHP_FALIAS(saveHTML, dom_document_save_html, arginfo_class_DOMDocument_saveHTML)
76-
PHP_FALIAS(saveHTMLFile, dom_document_save_html_file, arginfo_class_DOMDocument_saveHTMLFile)
75+
PHP_ME(domdocument, saveHTML, arginfo_class_DOMDocument_saveHTML, ZEND_ACC_PUBLIC)
76+
PHP_ME(domdocument, saveHTMLFile, arginfo_class_DOMDocument_saveHTMLFile, ZEND_ACC_PUBLIC)
7777
#endif /* defined(LIBXML_HTML_ENABLED) */
7878
#if defined(LIBXML_SCHEMAS_ENABLED)
79-
PHP_FALIAS(schemaValidate, dom_document_schema_validate_file, arginfo_class_DOMDocument_schemaValidate)
80-
PHP_FALIAS(schemaValidateSource, dom_document_schema_validate_xml, arginfo_class_DOMDocument_schemaValidateSource)
81-
PHP_FALIAS(relaxNGValidate, dom_document_relaxNG_validate_file, arginfo_class_DOMDocument_relaxNGValidate)
82-
PHP_FALIAS(relaxNGValidateSource, dom_document_relaxNG_validate_xml, arginfo_class_DOMDocument_relaxNGValidateSource)
79+
PHP_ME(domdocument, schemaValidate, arginfo_class_DOMDocument_schemaValidate, ZEND_ACC_PUBLIC)
80+
PHP_ME(domdocument, schemaValidateSource, arginfo_class_DOMDocument_schemaValidateSource, ZEND_ACC_PUBLIC)
81+
PHP_ME(domdocument, relaxNGValidate, arginfo_class_DOMDocument_relaxNGValidate, ZEND_ACC_PUBLIC)
82+
PHP_ME(domdocument, relaxNGValidateSource, arginfo_class_DOMDocument_relaxNGValidateSource, ZEND_ACC_PUBLIC)
8383
#endif
8484
PHP_ME(domdocument, registerNodeClass, arginfo_class_DOMDocument_registerNodeClass, ZEND_ACC_PUBLIC)
8585
PHP_FE_END
@@ -551,7 +551,7 @@ int dom_document_config_read(dom_object *obj, zval *retval)
551551
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-2141741547
552552
Since:
553553
*/
554-
PHP_FUNCTION(dom_document_create_element)
554+
PHP_METHOD(domdocument, createElement)
555555
{
556556
zval *id;
557557
xmlNode *node;
@@ -586,7 +586,7 @@ PHP_FUNCTION(dom_document_create_element)
586586
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-35CB04B5
587587
Since:
588588
*/
589-
PHP_FUNCTION(dom_document_create_document_fragment)
589+
PHP_METHOD(domdocument, createDocumentFragment)
590590
{
591591
zval *id;
592592
xmlNode *node;
@@ -614,7 +614,7 @@ PHP_FUNCTION(dom_document_create_document_fragment)
614614
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1975348127
615615
Since:
616616
*/
617-
PHP_FUNCTION(dom_document_create_text_node)
617+
PHP_METHOD(domdocument, createTextNode)
618618
{
619619
zval *id;
620620
xmlNode *node;
@@ -644,7 +644,7 @@ PHP_FUNCTION(dom_document_create_text_node)
644644
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1334481328
645645
Since:
646646
*/
647-
PHP_FUNCTION(dom_document_create_comment)
647+
PHP_METHOD(domdocument, createComment)
648648
{
649649
zval *id;
650650
xmlNode *node;
@@ -674,7 +674,7 @@ PHP_FUNCTION(dom_document_create_comment)
674674
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-D26C0AF8
675675
Since:
676676
*/
677-
PHP_FUNCTION(dom_document_create_cdatasection)
677+
PHP_METHOD(domdocument, createCDATASection)
678678
{
679679
zval *id;
680680
xmlNode *node;
@@ -704,7 +704,7 @@ PHP_FUNCTION(dom_document_create_cdatasection)
704704
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-135944439
705705
Since:
706706
*/
707-
PHP_FUNCTION(dom_document_create_processing_instruction)
707+
PHP_METHOD(domdocument, createProcessingInstruction)
708708
{
709709
zval *id;
710710
xmlNode *node;
@@ -741,7 +741,7 @@ PHP_FUNCTION(dom_document_create_processing_instruction)
741741
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1084891198
742742
Since:
743743
*/
744-
PHP_FUNCTION(dom_document_create_attribute)
744+
PHP_METHOD(domdocument, createAttribute)
745745
{
746746
zval *id;
747747
xmlAttrPtr node;
@@ -777,7 +777,7 @@ PHP_FUNCTION(dom_document_create_attribute)
777777
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-392B75AE
778778
Since:
779779
*/
780-
PHP_FUNCTION(dom_document_create_entity_reference)
780+
PHP_METHOD(domdocument, createEntityReference)
781781
{
782782
zval *id;
783783
xmlNode *node;
@@ -812,7 +812,7 @@ PHP_FUNCTION(dom_document_create_entity_reference)
812812
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-A6C9094
813813
Since:
814814
*/
815-
PHP_FUNCTION(dom_document_get_elements_by_tag_name)
815+
PHP_METHOD(domdocument, getElementsByTagName)
816816
{
817817
zval *id;
818818
xmlDocPtr docp;
@@ -839,7 +839,7 @@ PHP_FUNCTION(dom_document_get_elements_by_tag_name)
839839
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Core-Document-importNode
840840
Since: DOM Level 2
841841
*/
842-
PHP_FUNCTION(dom_document_import_node)
842+
PHP_METHOD(domdocument, importNode)
843843
{
844844
zval *id, *node;
845845
xmlDocPtr docp;
@@ -895,7 +895,7 @@ PHP_FUNCTION(dom_document_import_node)
895895
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-DocCrElNS
896896
Since: DOM Level 2
897897
*/
898-
PHP_FUNCTION(dom_document_create_element_ns)
898+
PHP_METHOD(domdocument, createElementNS)
899899
{
900900
zval *id;
901901
xmlDocPtr docp;
@@ -960,7 +960,7 @@ PHP_FUNCTION(dom_document_create_element_ns)
960960
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-DocCrAttrNS
961961
Since: DOM Level 2
962962
*/
963-
PHP_FUNCTION(dom_document_create_attribute_ns)
963+
PHP_METHOD(domdocument, createAttributeNS)
964964
{
965965
zval *id;
966966
xmlDocPtr docp;
@@ -1027,7 +1027,7 @@ PHP_FUNCTION(dom_document_create_attribute_ns)
10271027
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-getElBTNNS
10281028
Since: DOM Level 2
10291029
*/
1030-
PHP_FUNCTION(dom_document_get_elements_by_tag_name_ns)
1030+
PHP_METHOD(domdocument, getElementsByTagNameNS)
10311031
{
10321032
zval *id;
10331033
xmlDocPtr docp;
@@ -1055,7 +1055,7 @@ PHP_FUNCTION(dom_document_get_elements_by_tag_name_ns)
10551055
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-getElBId
10561056
Since: DOM Level 2
10571057
*/
1058-
PHP_FUNCTION(dom_document_get_element_by_id)
1058+
PHP_METHOD(domdocument, getElementById)
10591059
{
10601060
zval *id;
10611061
xmlDocPtr docp;
@@ -1087,7 +1087,7 @@ PHP_FUNCTION(dom_document_get_element_by_id)
10871087
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-adoptNode
10881088
Since: DOM Level 3
10891089
*/
1090-
PHP_FUNCTION(dom_document_adopt_node)
1090+
PHP_METHOD(domdocument, adoptNode)
10911091
{
10921092
zval *nodep = NULL;
10931093

@@ -1103,7 +1103,7 @@ PHP_FUNCTION(dom_document_adopt_node)
11031103
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-normalizeDocument
11041104
Since: DOM Level 3
11051105
*/
1106-
PHP_FUNCTION(dom_document_normalize_document)
1106+
PHP_METHOD(domdocument, normalizeDocument)
11071107
{
11081108
zval *id;
11091109
xmlDocPtr docp;
@@ -1428,7 +1428,7 @@ PHP_METHOD(domdocument, loadXML)
14281428
/* {{{ proto int dom_document_save(string file)
14291429
Convenience method to save to file
14301430
*/
1431-
PHP_FUNCTION(dom_document_save)
1431+
PHP_METHOD(domdocument, save)
14321432
{
14331433
zval *id;
14341434
xmlDoc *docp;
@@ -1474,7 +1474,7 @@ PHP_FUNCTION(dom_document_save)
14741474
URL: http://www.w3.org/TR/DOM-Level-3-LS/load-save.html#LS-DocumentLS-saveXML
14751475
Since: DOM Level 3
14761476
*/
1477-
PHP_FUNCTION(dom_document_savexml)
1477+
PHP_METHOD(domdocument, saveXML)
14781478
{
14791479
zval *id, *nodep = NULL;
14801480
xmlDoc *docp;
@@ -1585,7 +1585,7 @@ static void php_dom_remove_xinclude_nodes(xmlNodePtr cur) /* {{{ */
15851585

15861586
/* {{{ proto int dom_document_xinclude([int options])
15871587
Substitutues xincludes in a DomDocument */
1588-
PHP_FUNCTION(dom_document_xinclude)
1588+
PHP_METHOD(domdocument, xinclude)
15891589
{
15901590
zval *id;
15911591
xmlDoc *docp;
@@ -1632,7 +1632,7 @@ PHP_FUNCTION(dom_document_xinclude)
16321632
/* {{{ proto bool dom_document_validate()
16331633
Since: DOM extended
16341634
*/
1635-
PHP_FUNCTION(dom_document_validate)
1635+
PHP_METHOD(domdocument, validate)
16361636
{
16371637
zval *id;
16381638
xmlDoc *docp;
@@ -1752,14 +1752,14 @@ static void _dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type
17521752
/* }}} */
17531753

17541754
/* {{{ proto bool dom_document_schema_validate_file(string filename, int flags); */
1755-
PHP_FUNCTION(dom_document_schema_validate_file)
1755+
PHP_METHOD(domdocument, schemaValidate)
17561756
{
17571757
_dom_document_schema_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_FILE);
17581758
}
17591759
/* }}} end dom_document_schema_validate_file */
17601760

17611761
/* {{{ proto bool dom_document_schema_validate(string source, int flags); */
1762-
PHP_FUNCTION(dom_document_schema_validate_xml)
1762+
PHP_METHOD(domdocument, schemaValidateSource)
17631763
{
17641764
_dom_document_schema_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_STRING);
17651765
}
@@ -1846,14 +1846,14 @@ static void _dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAMETERS, int typ
18461846
/* }}} */
18471847

18481848
/* {{{ proto bool dom_document_relaxNG_validate_file(string filename); */
1849-
PHP_FUNCTION(dom_document_relaxNG_validate_file)
1849+
PHP_METHOD(domdocument, relaxNGValidate)
18501850
{
18511851
_dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_FILE);
18521852
}
18531853
/* }}} end dom_document_relaxNG_validate_file */
18541854

18551855
/* {{{ proto bool dom_document_relaxNG_validate_xml(string source); */
1856-
PHP_FUNCTION(dom_document_relaxNG_validate_xml)
1856+
PHP_METHOD(domdocument, relaxNGValidateSource)
18571857
{
18581858
_dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_STRING);
18591859
}
@@ -1978,7 +1978,7 @@ PHP_METHOD(domdocument, loadHTML)
19781978
/* {{{ proto int dom_document_save_html_file(string file)
19791979
Convenience method to save to file as html
19801980
*/
1981-
PHP_FUNCTION(dom_document_save_html_file)
1981+
PHP_METHOD(domdocument, saveHTMLFile)
19821982
{
19831983
zval *id;
19841984
xmlDoc *docp;
@@ -2018,7 +2018,7 @@ PHP_FUNCTION(dom_document_save_html_file)
20182018
/* {{{ proto string dom_document_save_html()
20192019
Convenience method to output as html
20202020
*/
2021-
PHP_FUNCTION(dom_document_save_html)
2021+
PHP_METHOD(domdocument, saveHTML)
20222022
{
20232023
zval *id, *nodep = NULL;
20242024
xmlDoc *docp;

0 commit comments

Comments
 (0)