Skip to content

Commit b87d8cd

Browse files
author
Rob Richards
committed
prototype fixes (Jakub Vrána)
1 parent 1e0212e commit b87d8cd

20 files changed

+89
-89
lines changed

Diff for: ext/dom/attr.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ PHP_METHOD(domattr, __construct)
8888
/* }}} end DOMAttr::__construct */
8989

9090

91-
/* {{{ proto name string
91+
/* {{{ name string
9292
readonly=yes
9393
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-1112119403
9494
Since:
@@ -114,7 +114,7 @@ int dom_attr_name_read(dom_object *obj, zval **retval TSRMLS_DC)
114114

115115

116116

117-
/* {{{ proto specified boolean
117+
/* {{{ specified boolean
118118
readonly=yes
119119
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-862529273
120120
Since:
@@ -131,7 +131,7 @@ int dom_attr_specified_read(dom_object *obj, zval **retval TSRMLS_DC)
131131

132132

133133

134-
/* {{{ proto value string
134+
/* {{{ value string
135135
readonly=no
136136
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-221662474
137137
Since:
@@ -200,7 +200,7 @@ int dom_attr_value_write(dom_object *obj, zval *newval TSRMLS_DC)
200200

201201

202202

203-
/* {{{ proto ownerElement DOMElement
203+
/* {{{ ownerElement DOMElement
204204
readonly=yes
205205
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Attr-ownerElement
206206
Since: DOM Level 2
@@ -236,7 +236,7 @@ int dom_attr_owner_element_read(dom_object *obj, zval **retval TSRMLS_DC)
236236

237237

238238

239-
/* {{{ proto schemaTypeInfo DOMTypeInfo
239+
/* {{{ schemaTypeInfo DOMTypeInfo
240240
readonly=yes
241241
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Attr-schemaTypeInfo
242242
Since: DOM Level 3

Diff for: ext/dom/characterdata.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ zend_function_entry php_dom_characterdata_class_functions[] = {
4444
{NULL, NULL, NULL}
4545
};
4646

47-
/* {{{ proto data string
47+
/* {{{ data string
4848
readonly=no
4949
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-72AB8359
5050
Since:
@@ -105,7 +105,7 @@ int dom_characterdata_data_write(dom_object *obj, zval *newval TSRMLS_DC)
105105

106106
/* }}} */
107107

108-
/* {{{ proto length long
108+
/* {{{ length long
109109
readonly=yes
110110
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-7D61178C
111111
Since:
@@ -140,7 +140,7 @@ int dom_characterdata_length_read(dom_object *obj, zval **retval TSRMLS_DC)
140140
/* }}} */
141141

142142

143-
/* {{{ proto string dom_characterdata_substring_data(long offset, long count);
143+
/* {{{ proto string dom_characterdata_substring_data(int offset, int count);
144144
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-6531BCCF
145145
Since:
146146
*/
@@ -215,7 +215,7 @@ PHP_FUNCTION(dom_characterdata_append_data)
215215
/* }}} end dom_characterdata_append_data */
216216

217217

218-
/* {{{ proto void dom_characterdata_insert_data(long offset, string arg);
218+
/* {{{ proto void dom_characterdata_insert_data(int offset, string arg);
219219
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-3EDB695F
220220
Since:
221221
*/
@@ -264,7 +264,7 @@ PHP_FUNCTION(dom_characterdata_insert_data)
264264
/* }}} end dom_characterdata_insert_data */
265265

266266

267-
/* {{{ proto void dom_characterdata_delete_data(long offset, long count);
267+
/* {{{ proto void dom_characterdata_delete_data(int offset, int count);
268268
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-7C603781
269269
Since:
270270
*/
@@ -320,7 +320,7 @@ PHP_FUNCTION(dom_characterdata_delete_data)
320320
/* }}} end dom_characterdata_delete_data */
321321

322322

323-
/* {{{ proto void dom_characterdata_replace_data(long offset, long count, string arg);
323+
/* {{{ proto void dom_characterdata_replace_data(int offset, int count, string arg);
324324
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-E5CBA7FB
325325
Since:
326326
*/

Diff for: ext/dom/document.c

+21-21
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ zend_function_entry php_dom_document_class_functions[] = {
8888
{NULL, NULL, NULL}
8989
};
9090

91-
/* {{{ proto docType DOMDocumentType
91+
/* {{{ docType DOMDocumentType
9292
readonly=yes
9393
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-B63ED1A31
9494
Since:
@@ -124,7 +124,7 @@ int dom_document_doctype_read(dom_object *obj, zval **retval TSRMLS_DC)
124124

125125

126126

127-
/* {{{ proto implementation DOMImplementation
127+
/* {{{ implementation DOMImplementation
128128
readonly=yes
129129
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1B793EBA
130130
Since:
@@ -140,7 +140,7 @@ int dom_document_implementation_read(dom_object *obj, zval **retval TSRMLS_DC)
140140

141141

142142

143-
/* {{{ proto documentElement DOMElement
143+
/* {{{ documentElement DOMElement
144144
readonly=yes
145145
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-87CD092
146146
Since:
@@ -173,7 +173,7 @@ int dom_document_document_element_read(dom_object *obj, zval **retval TSRMLS_DC)
173173

174174
/* }}} */
175175

176-
/* {{{ proto encoding string
176+
/* {{{ encoding string
177177
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-encoding
178178
Since: DOM Level 3
179179
*/
@@ -246,7 +246,7 @@ int dom_document_encoding_write(dom_object *obj, zval *newval TSRMLS_DC)
246246

247247

248248

249-
/* {{{ proto standalone boolean
249+
/* {{{ standalone boolean
250250
readonly=no
251251
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-standalone
252252
Since: DOM Level 3
@@ -312,7 +312,7 @@ int dom_document_standalone_write(dom_object *obj, zval *newval TSRMLS_DC)
312312

313313

314314

315-
/* {{{ proto version string
315+
/* {{{ version string
316316
readonly=no
317317
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-version
318318
Since: DOM Level 3
@@ -377,7 +377,7 @@ int dom_document_version_write(dom_object *obj, zval *newval TSRMLS_DC)
377377

378378
/* }}} */
379379

380-
/* {{{ proto strictErrorChecking boolean
380+
/* {{{ strictErrorChecking boolean
381381
readonly=no
382382
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-strictErrorChecking
383383
Since: DOM Level 3
@@ -422,7 +422,7 @@ int dom_document_strict_error_checking_write(dom_object *obj, zval *newval TSRML
422422

423423
/* }}} */
424424

425-
/* {{{ proto formatOutput boolean
425+
/* {{{ formatOutput boolean
426426
readonly=no
427427
*/
428428
int dom_document_format_output_read(dom_object *obj, zval **retval TSRMLS_DC)
@@ -464,7 +464,7 @@ int dom_document_format_output_write(dom_object *obj, zval *newval TSRMLS_DC)
464464
}
465465
/* }}} */
466466

467-
/* {{{ proto validateOnParse boolean
467+
/* {{{ validateOnParse boolean
468468
readonly=no
469469
*/
470470
int dom_document_validate_on_parse_read(dom_object *obj, zval **retval TSRMLS_DC)
@@ -507,7 +507,7 @@ int dom_document_validate_on_parse_write(dom_object *obj, zval *newval TSRMLS_DC
507507
/* }}} */
508508

509509

510-
/* {{{ proto resolveExternals boolean
510+
/* {{{ resolveExternals boolean
511511
readonly=no
512512
*/
513513
int dom_document_resolve_externals_read(dom_object *obj, zval **retval TSRMLS_DC)
@@ -550,7 +550,7 @@ int dom_document_resolve_externals_write(dom_object *obj, zval *newval TSRMLS_DC
550550
/* }}} */
551551

552552

553-
/* {{{ proto preserveWhiteSpace boolean
553+
/* {{{ preserveWhiteSpace boolean
554554
readonly=no
555555
*/
556556
int dom_document_preserve_whitespace_read(dom_object *obj, zval **retval TSRMLS_DC)
@@ -592,7 +592,7 @@ int dom_document_preserve_whitespace_write(dom_object *obj, zval *newval TSRMLS_
592592
}
593593
/* }}} */
594594

595-
/* {{{ proto recover boolean
595+
/* {{{ recover boolean
596596
readonly=no
597597
*/
598598
int dom_document_recover_read(dom_object *obj, zval **retval TSRMLS_DC)
@@ -635,7 +635,7 @@ int dom_document_recover_write(dom_object *obj, zval *newval TSRMLS_DC)
635635
/* }}} */
636636

637637

638-
/* {{{ proto substituteEntities boolean
638+
/* {{{ substituteEntities boolean
639639
readonly=no
640640
*/
641641
int dom_document_substitue_entities_read(dom_object *obj, zval **retval TSRMLS_DC)
@@ -678,7 +678,7 @@ int dom_document_substitue_entities_write(dom_object *obj, zval *newval TSRMLS_D
678678
/* }}} */
679679

680680

681-
/* {{{ proto documentURI string
681+
/* {{{ documentURI string
682682
readonly=no
683683
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-documentURI
684684
Since: DOM Level 3
@@ -744,7 +744,7 @@ int dom_document_document_uri_write(dom_object *obj, zval *newval TSRMLS_DC)
744744

745745

746746

747-
/* {{{ proto config DOMConfiguration
747+
/* {{{ config DOMConfiguration
748748
readonly=yes
749749
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-config
750750
Since: DOM Level 3
@@ -1572,7 +1572,7 @@ static void dom_parse_document(INTERNAL_FUNCTION_PARAMETERS, int mode) {
15721572
}
15731573
/* }}} end dom_parser_document */
15741574

1575-
/* {{{ proto boolean|DOMNode dom_document_load(string source);
1575+
/* {{{ proto DOMNode dom_document_load(string source);
15761576
URL: http://www.w3.org/TR/DOM-Level-3-LS/load-save.html#LS-DocumentLS-load
15771577
Since: DOM Level 3
15781578
*/
@@ -1582,7 +1582,7 @@ PHP_METHOD(domdocument, load)
15821582
}
15831583
/* }}} end dom_document_load */
15841584

1585-
/* {{{ proto boolean|DOMNode dom_document_loadxml(string source);
1585+
/* {{{ proto DOMNode dom_document_loadxml(string source);
15861586
URL: http://www.w3.org/TR/DOM-Level-3-LS/load-save.html#LS-DocumentLS-loadXML
15871587
Since: DOM Level 3
15881588
*/
@@ -1592,7 +1592,7 @@ PHP_METHOD(domdocument, loadXML)
15921592
}
15931593
/* }}} end dom_document_loadxml */
15941594

1595-
/* {{{ proto long dom_document_save(string file);
1595+
/* {{{ proto int dom_document_save(string file);
15961596
Convenience method to save to file
15971597
*/
15981598
PHP_FUNCTION(dom_document_save)
@@ -2050,7 +2050,7 @@ static void dom_load_html(INTERNAL_FUNCTION_PARAMETERS, int mode)
20502050
}
20512051
}
20522052

2053-
/* {{{ proto boolean|DOMNode dom_document_load_html_file(string source);
2053+
/* {{{ proto DOMNode dom_document_load_html_file(string source);
20542054
Since: DOM extended
20552055
*/
20562056
PHP_METHOD(domdocument, loadHTMLFile)
@@ -2059,7 +2059,7 @@ PHP_METHOD(domdocument, loadHTMLFile)
20592059
}
20602060
/* }}} end dom_document_load_html_file */
20612061

2062-
/* {{{ proto boolean|DOMNode dom_document_load_html(string source);
2062+
/* {{{ proto DOMNode dom_document_load_html(string source);
20632063
Since: DOM extended
20642064
*/
20652065
PHP_METHOD(domdocument, loadHTML)
@@ -2068,7 +2068,7 @@ PHP_METHOD(domdocument, loadHTML)
20682068
}
20692069
/* }}} end dom_document_load_html */
20702070

2071-
/* {{{ proto long dom_document_save_html_file(string file);
2071+
/* {{{ proto int dom_document_save_html_file(string file);
20722072
Convenience method to save to file as html
20732073
*/
20742074
PHP_FUNCTION(dom_document_save_html_file)

Diff for: ext/dom/documenttype.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ zend_function_entry php_dom_documenttype_class_functions[] = {
3838
{NULL, NULL, NULL}
3939
};
4040

41-
/* {{{ proto name string
41+
/* {{{ name string
4242
readonly=yes
4343
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1844763134
4444
Since:
@@ -64,7 +64,7 @@ int dom_documenttype_name_read(dom_object *obj, zval **retval TSRMLS_DC)
6464

6565

6666

67-
/* {{{ proto entities DOMNamedNodeMap
67+
/* {{{ entities DOMNamedNodeMap
6868
readonly=yes
6969
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1788794630
7070
Since:
@@ -97,7 +97,7 @@ int dom_documenttype_entities_read(dom_object *obj, zval **retval TSRMLS_DC)
9797

9898

9999

100-
/* {{{ proto notations DOMNamedNodeMap
100+
/* {{{ notations DOMNamedNodeMap
101101
readonly=yes
102102
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-D46829EF
103103
Since:
@@ -130,7 +130,7 @@ int dom_documenttype_notations_read(dom_object *obj, zval **retval TSRMLS_DC)
130130

131131

132132

133-
/* {{{ proto publicId string
133+
/* {{{ publicId string
134134
readonly=yes
135135
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-Core-DocType-publicId
136136
Since: DOM Level 2
@@ -160,7 +160,7 @@ int dom_documenttype_public_id_read(dom_object *obj, zval **retval TSRMLS_DC)
160160

161161

162162

163-
/* {{{ proto systemId string
163+
/* {{{ systemId string
164164
readonly=yes
165165
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-Core-DocType-systemId
166166
Since: DOM Level 2
@@ -189,7 +189,7 @@ int dom_documenttype_system_id_read(dom_object *obj, zval **retval TSRMLS_DC)
189189

190190

191191

192-
/* {{{ proto internalSubset string
192+
/* {{{ internalSubset string
193193
readonly=yes
194194
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-Core-DocType-internalSubset
195195
Since: DOM Level 2

Diff for: ext/dom/domerror.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ zend_function_entry php_dom_domerror_class_functions[] = {
4141

4242
/* {{{ attribute protos, not implemented yet */
4343

44-
/* {{{ proto severity unsigned short
44+
/* {{{ severity unsigned short
4545
readonly=yes
4646
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ERROR-DOMError-severity
4747
Since:
@@ -57,7 +57,7 @@ int dom_domerror_severity_read(dom_object *obj, zval **retval TSRMLS_DC)
5757

5858

5959

60-
/* {{{ proto message string
60+
/* {{{ message string
6161
readonly=yes
6262
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ERROR-DOMError-message
6363
Since:
@@ -73,7 +73,7 @@ int dom_domerror_message_read(dom_object *obj, zval **retval TSRMLS_DC)
7373

7474

7575

76-
/* {{{ proto type string
76+
/* {{{ type string
7777
readonly=yes
7878
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ERROR-DOMError-type
7979
Since:
@@ -89,7 +89,7 @@ int dom_domerror_type_read(dom_object *obj, zval **retval TSRMLS_DC)
8989

9090

9191

92-
/* {{{ proto relatedException object
92+
/* {{{ relatedException object
9393
readonly=yes
9494
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ERROR-DOMError-relatedException
9595
Since:
@@ -105,7 +105,7 @@ int dom_domerror_related_exception_read(dom_object *obj, zval **retval TSRMLS_DC
105105

106106

107107

108-
/* {{{ proto relatedData domobject
108+
/* {{{ relatedData domobject
109109
readonly=yes
110110
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ERROR-DOMError-relatedData
111111
Since:
@@ -121,7 +121,7 @@ int dom_domerror_related_data_read(dom_object *obj, zval **retval TSRMLS_DC)
121121

122122

123123

124-
/* {{{ proto location domlocator
124+
/* {{{ location domlocator
125125
readonly=yes
126126
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ERROR-DOMError-location
127127
Since:

0 commit comments

Comments
 (0)