Skip to content

Generate method entries for ext/dom #5374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/gen_stub.php
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ public function getFunctionEntry(): string {
if ($this->alias->className) {
return sprintf(
"\tZEND_MALIAS(%s, %s, %s, %s, %s)\n",
$this->alias->className, $this->name, $this->alias->name, $this->getArgInfoName(), $this->getFlagsAsString()
$this->alias->className, $this->name->name, $this->alias->name, $this->getArgInfoName(), $this->getFlagsAsString()
);
} else {
return sprintf(
Expand Down
11 changes: 2 additions & 9 deletions ext/dom/attr.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#if HAVE_LIBXML && HAVE_DOM

#include "php_dom.h"
#include "attr_arginfo.h"

/*
* class DOMAttr extends DOMNode
Expand All @@ -33,14 +32,8 @@
* Since:
*/

const zend_function_entry php_dom_attr_class_functions[] = {
PHP_ME(domattr, isId, arginfo_class_DOMAttr_isId, ZEND_ACC_PUBLIC)
PHP_ME(domattr, __construct, arginfo_class_DOMAttr___construct, ZEND_ACC_PUBLIC)
PHP_FE_END
};

/* {{{ proto DOMAttr::__construct(string name, [string value]) */
PHP_METHOD(domattr, __construct)
PHP_METHOD(DOMAttr, __construct)
{
xmlAttrPtr nodep = NULL;
xmlNodePtr oldnode = NULL;
Expand Down Expand Up @@ -213,7 +206,7 @@ int dom_attr_schema_type_info_read(dom_object *obj, zval *retval)
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Attr-isId
Since: DOM Level 3
*/
PHP_METHOD(domattr, isId)
PHP_METHOD(DOMAttr, isId)
{
zval *id;
dom_object *intern;
Expand Down
9 changes: 0 additions & 9 deletions ext/dom/attr.stub.php

This file was deleted.

9 changes: 0 additions & 9 deletions ext/dom/attr_arginfo.h

This file was deleted.

8 changes: 1 addition & 7 deletions ext/dom/cdatasection.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
#include "php.h"
#if HAVE_LIBXML && HAVE_DOM
#include "php_dom.h"
#include "cdatasection_arginfo.h"

/*
* class DOMCdataSection extends DOMText
Expand All @@ -31,13 +30,8 @@
* Since:
*/

const zend_function_entry php_dom_cdatasection_class_functions[] = {
PHP_ME(domcdatasection, __construct, arginfo_class_DOMCdataSection___construct, ZEND_ACC_PUBLIC)
PHP_FE_END
};

/* {{{ proto DOMCdataSection::__construct(string value); */
PHP_METHOD(domcdatasection, __construct)
PHP_METHOD(DOMCdataSection, __construct)
{
xmlNodePtr nodep = NULL, oldnode = NULL;
dom_object *intern;
Expand Down
6 changes: 0 additions & 6 deletions ext/dom/cdatasection.stub.php

This file was deleted.

5 changes: 0 additions & 5 deletions ext/dom/cdatasection_arginfo.h

This file was deleted.

32 changes: 9 additions & 23 deletions ext/dom/characterdata.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
#include "php.h"
#if HAVE_LIBXML && HAVE_DOM
#include "php_dom.h"
#include "characterdata_arginfo.h"

/*
* class DOMCharacterData extends DOMNode
Expand All @@ -31,19 +30,6 @@
* Since:
*/

const zend_function_entry php_dom_characterdata_class_functions[] = {
PHP_ME(domcharacterdata, substringData, arginfo_class_DOMCharacterData_substringData, ZEND_ACC_PUBLIC)
PHP_ME(domcharacterdata, appendData, arginfo_class_DOMCharacterData_appendData, ZEND_ACC_PUBLIC)
PHP_ME(domcharacterdata, insertData, arginfo_class_DOMCharacterData_insertData, ZEND_ACC_PUBLIC)
PHP_ME(domcharacterdata, deleteData, arginfo_class_DOMCharacterData_deleteData, ZEND_ACC_PUBLIC)
PHP_ME(domcharacterdata, replaceData, arginfo_class_DOMCharacterData_replaceData, ZEND_ACC_PUBLIC)
PHP_ME(domcharacterdata, remove, arginfo_class_DOMCharacterData_remove, ZEND_ACC_PUBLIC)
PHP_ME(domcharacterdata, after, arginfo_class_DOMCharacterData_after, ZEND_ACC_PUBLIC)
PHP_ME(domcharacterdata, before, arginfo_class_DOMCharacterData_before, ZEND_ACC_PUBLIC)
PHP_ME(domcharacterdata, replaceWith, arginfo_class_DOMCharacterData_replaceWith, ZEND_ACC_PUBLIC)
PHP_FE_END
};

/* {{{ data string
readonly=no
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-72AB8359
Expand Down Expand Up @@ -126,7 +112,7 @@ int dom_characterdata_length_read(dom_object *obj, zval *retval)
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-6531BCCF
Since:
*/
PHP_METHOD(domcharacterdata, substringData)
PHP_METHOD(DOMCharacterData, substringData)
{
zval *id;
xmlChar *cur;
Expand Down Expand Up @@ -176,7 +162,7 @@ PHP_METHOD(domcharacterdata, substringData)
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-32791A2F
Since:
*/
PHP_METHOD(domcharacterdata, appendData)
PHP_METHOD(DOMCharacterData, appendData)
{
zval *id;
xmlNode *nodep;
Expand All @@ -199,7 +185,7 @@ PHP_METHOD(domcharacterdata, appendData)
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-3EDB695F
Since:
*/
PHP_METHOD(domcharacterdata, insertData)
PHP_METHOD(DOMCharacterData, insertData)
{
zval *id;
xmlChar *cur, *first, *second;
Expand Down Expand Up @@ -249,7 +235,7 @@ PHP_METHOD(domcharacterdata, insertData)
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-7C603781
Since:
*/
PHP_METHOD(domcharacterdata, deleteData)
PHP_METHOD(DOMCharacterData, deleteData)
{
zval *id;
xmlChar *cur, *substring, *second;
Expand Down Expand Up @@ -305,7 +291,7 @@ PHP_METHOD(domcharacterdata, deleteData)
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-E5CBA7FB
Since:
*/
PHP_METHOD(domcharacterdata, replaceData)
PHP_METHOD(DOMCharacterData, replaceData)
{
zval *id;
xmlChar *cur, *substring, *second = NULL;
Expand Down Expand Up @@ -365,7 +351,7 @@ PHP_METHOD(domcharacterdata, replaceData)
}
/* }}} end dom_characterdata_replace_data */

PHP_METHOD(domcharacterdata, remove)
PHP_METHOD(DOMCharacterData, remove)
{
zval *id = ZEND_THIS;
xmlNodePtr children, child;
Expand Down Expand Up @@ -413,7 +399,7 @@ PHP_METHOD(domcharacterdata, remove)
RETURN_NULL();
}

PHP_METHOD(domcharacterdata, after)
PHP_METHOD(DOMCharacterData, after)
{
int argc;
zval *args, *id;
Expand All @@ -430,7 +416,7 @@ PHP_METHOD(domcharacterdata, after)
dom_parent_node_after(intern, args, argc);
}

PHP_METHOD(domcharacterdata, before)
PHP_METHOD(DOMCharacterData, before)
{
int argc;
zval *args, *id;
Expand All @@ -447,7 +433,7 @@ PHP_METHOD(domcharacterdata, before)
dom_parent_node_before(intern, args, argc);
}

PHP_METHOD(domcharacterdata, replaceWith)
PHP_METHOD(DOMCharacterData, replaceWith)
{
int argc;
zval *args, *id;
Expand Down
30 changes: 0 additions & 30 deletions ext/dom/characterdata.stub.php

This file was deleted.

34 changes: 0 additions & 34 deletions ext/dom/characterdata_arginfo.h

This file was deleted.

8 changes: 1 addition & 7 deletions ext/dom/comment.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
#include "php.h"
#if HAVE_LIBXML && HAVE_DOM
#include "php_dom.h"
#include "comment_arginfo.h"

/*
* class DOMComment extends DOMCharacterData
Expand All @@ -31,13 +30,8 @@
* Since:
*/

const zend_function_entry php_dom_comment_class_functions[] = {
PHP_ME(domcomment, __construct, arginfo_class_DOMComment___construct, ZEND_ACC_PUBLIC)
PHP_FE_END
};

/* {{{ proto DOMComment::__construct([string value]); */
PHP_METHOD(domcomment, __construct)
PHP_METHOD(DOMComment, __construct)
{
xmlNodePtr nodep = NULL, oldnode = NULL;
dom_object *intern;
Expand Down
6 changes: 0 additions & 6 deletions ext/dom/comment.stub.php

This file was deleted.

5 changes: 0 additions & 5 deletions ext/dom/comment_arginfo.h

This file was deleted.

Loading