Skip to content

Commit 5b0f34a

Browse files
author
Rob Richards
committed
Fix bug #28584: DOMText::splitText() does not split text properly (benjcarson)
Prototype fixes
1 parent 7d04465 commit 5b0f34a

20 files changed

+157
-171
lines changed

ext/dom/attr.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232

3333
/*
34-
* class domattr extends domnode
34+
* class DOMAttr extends DOMNode
3535
*
3636
* URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-637646024
3737
* Since:
@@ -43,7 +43,7 @@ zend_function_entry php_dom_attr_class_functions[] = {
4343
{NULL, NULL, NULL}
4444
};
4545

46-
/* {{{ proto void DomAttr::__construct(string name, [string value]); */
46+
/* {{{ proto void DOMAttr::__construct(string name, [string value]); */
4747
PHP_METHOD(domattr, __construct)
4848
{
4949

@@ -85,7 +85,7 @@ PHP_METHOD(domattr, __construct)
8585
}
8686
}
8787

88-
/* }}} end DomAttr::__construct */
88+
/* }}} end DOMAttr::__construct */
8989

9090

9191
/* {{{ proto name string
@@ -200,7 +200,7 @@ int dom_attr_value_write(dom_object *obj, zval *newval TSRMLS_DC)
200200

201201

202202

203-
/* {{{ proto ownerElement element
203+
/* {{{ proto 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 typeinfo
239+
/* {{{ proto 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

ext/dom/cdatasection.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030

3131
/*
32-
* class domcdatasection extends domtext
32+
* class DOMCdataSection extends DOMText
3333
*
3434
* URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-667469212
3535
* Since:
@@ -40,7 +40,7 @@ zend_function_entry php_dom_cdatasection_class_functions[] = {
4040
{NULL, NULL, NULL}
4141
};
4242

43-
/* {{{ proto void DomCDataSection::__construct(string value); */
43+
/* {{{ proto void DOMCdataSection::__construct(string value); */
4444
PHP_METHOD(domcdatasection, __construct)
4545
{
4646

@@ -73,6 +73,6 @@ PHP_METHOD(domcdatasection, __construct)
7373
php_libxml_increment_node_ptr((php_libxml_node_object *)intern, nodep, (void *)intern TSRMLS_CC);
7474
}
7575
}
76-
/* }}} end DomCDataSection::__construct */
76+
/* }}} end DOMCdataSection::__construct */
7777

7878
#endif

ext/dom/characterdata.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030

3131
/*
32-
* class domcharacterdata extends domnode
32+
* class DOMCharacterData extends DOMNode
3333
*
3434
* URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-FF21A306
3535
* Since:
@@ -105,7 +105,7 @@ int dom_characterdata_data_write(dom_object *obj, zval *newval TSRMLS_DC)
105105

106106
/* }}} */
107107

108-
/* {{{ proto length unsigned long
108+
/* {{{ proto 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 domstring dom_characterdata_substring_data(unsigned long offset, unsigned long count);
143+
/* {{{ proto string dom_characterdata_substring_data(long offset, long count);
144144
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-6531BCCF
145145
Since:
146146
*/
@@ -190,7 +190,7 @@ PHP_FUNCTION(dom_characterdata_substring_data)
190190
/* }}} end dom_characterdata_substring_data */
191191

192192

193-
/* {{{ proto dom_void dom_characterdata_append_data(string arg);
193+
/* {{{ proto void dom_characterdata_append_data(string arg);
194194
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-32791A2F
195195
Since:
196196
*/
@@ -215,7 +215,7 @@ PHP_FUNCTION(dom_characterdata_append_data)
215215
/* }}} end dom_characterdata_append_data */
216216

217217

218-
/* {{{ proto dom_void dom_characterdata_insert_data(unsigned long offset, string arg);
218+
/* {{{ proto void dom_characterdata_insert_data(long 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 dom_void dom_characterdata_delete_data(unsigned long offset, unsigned long count);
267+
/* {{{ proto void dom_characterdata_delete_data(long offset, long 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 dom_void dom_characterdata_replace_data(unsigned long offset, unsigned long count, string arg);
323+
/* {{{ proto void dom_characterdata_replace_data(long offset, long 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
*/

ext/dom/comment.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030

3131
/*
32-
* class domcomment extends domcharacterdata
32+
* class DOMComment extends DOMCharacterData
3333
*
3434
* URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-1728279322
3535
* Since:
@@ -40,7 +40,7 @@ zend_function_entry php_dom_comment_class_functions[] = {
4040
{NULL, NULL, NULL}
4141
};
4242

43-
/* {{{ proto void DomComment::__construct([string value]); */
43+
/* {{{ proto void DOMComment::__construct([string value]); */
4444
PHP_METHOD(domcomment, __construct)
4545
{
4646

@@ -73,5 +73,5 @@ PHP_METHOD(domcomment, __construct)
7373
php_libxml_increment_node_ptr((php_libxml_node_object *)intern, (xmlNodePtr)nodep, (void *)intern TSRMLS_CC);
7474
}
7575
}
76-
/* }}} end DomComment::__construct */
76+
/* }}} end DOMComment::__construct */
7777
#endif

0 commit comments

Comments
 (0)