Skip to content

Deduplicate ParentNode and ChildNode interface implementations using @implementation-alias #12158

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.

Sign up for GitHub

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 1 commit into from
Closed

Deduplicate ParentNode and ChildNode interface implementations using @implementation-alias #12158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
59 changes: 0 additions & 59 deletions ext/dom/characterdata.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,63 +325,4 @@ PHP_METHOD(DOMCharacterData, replaceData)
}
/* }}} end dom_characterdata_replace_data */

PHP_METHOD(DOMCharacterData, remove)
{
dom_object *intern;

if (zend_parse_parameters_none() == FAILURE) {
RETURN_THROWS();
}

DOM_GET_THIS_INTERN(intern);

dom_child_node_remove(intern);
RETURN_NULL();
}

PHP_METHOD(DOMCharacterData, after)
{
uint32_t argc = 0;
zval *args;
dom_object *intern;

if (zend_parse_parameters(ZEND_NUM_ARGS(), "*", &args, &argc) == FAILURE) {
RETURN_THROWS();
}

DOM_GET_THIS_INTERN(intern);

dom_parent_node_after(intern, args, argc);
}

PHP_METHOD(DOMCharacterData, before)
{
uint32_t argc = 0;
zval *args;
dom_object *intern;

if (zend_parse_parameters(ZEND_NUM_ARGS(), "*", &args, &argc) == FAILURE) {
RETURN_THROWS();
}

DOM_GET_THIS_INTERN(intern);

dom_parent_node_before(intern, args, argc);
}

PHP_METHOD(DOMCharacterData, replaceWith)
{
uint32_t argc = 0;
zval *args;
dom_object *intern;

if (zend_parse_parameters(ZEND_NUM_ARGS(), "*", &args, &argc) == FAILURE) {
RETURN_THROWS();
}

DOM_GET_THIS_INTERN(intern);

dom_child_replace_with(intern, args, argc);
}

#endif
38 changes: 0 additions & 38 deletions ext/dom/document.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2082,44 +2082,6 @@ PHP_METHOD(DOMDocument, registerNodeClass)
}
/* }}} */

/* {{{ URL: https://dom.spec.whatwg.org/#dom-parentnode-append
Since: DOM Living Standard (DOM4)
*/
PHP_METHOD(DOMDocument, append)
{
uint32_t argc = 0;
zval *args;
dom_object *intern;

if (zend_parse_parameters(ZEND_NUM_ARGS(), "*", &args, &argc) == FAILURE) {
RETURN_THROWS();
}

DOM_GET_THIS_INTERN(intern);

dom_parent_node_append(intern, args, argc);
}
/* }}} */

/* {{{ URL: https://dom.spec.whatwg.org/#dom-parentnode-prepend
Since: DOM Living Standard (DOM4)
*/
PHP_METHOD(DOMDocument, prepend)
{
uint32_t argc = 0;
zval *args;
dom_object *intern;

if (zend_parse_parameters(ZEND_NUM_ARGS(), "*", &args, &argc) == FAILURE) {
RETURN_THROWS();
}

DOM_GET_THIS_INTERN(intern);

dom_parent_node_prepend(intern, args, argc);
}
/* }}} */

/* {{{ URL: https://dom.spec.whatwg.org/#dom-parentnode-replacechildren
Since:
*/
Expand Down
57 changes: 0 additions & 57 deletions ext/dom/documentfragment.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,61 +93,4 @@ PHP_METHOD(DOMDocumentFragment, appendXML) {
}
/* }}} */

/* {{{ URL: https://dom.spec.whatwg.org/#dom-parentnode-append
Since: DOM Living Standard (DOM4)
*/
PHP_METHOD(DOMDocumentFragment, append)
{
uint32_t argc = 0;
zval *args;
dom_object *intern;

if (zend_parse_parameters(ZEND_NUM_ARGS(), "*", &args, &argc) == FAILURE) {
RETURN_THROWS();
}

DOM_GET_THIS_INTERN(intern);

dom_parent_node_append(intern, args, argc);
}
/* }}} */

/* {{{ URL: https://dom.spec.whatwg.org/#dom-parentnode-prepend
Since: DOM Living Standard (DOM4)
*/
PHP_METHOD(DOMDocumentFragment, prepend)
{
uint32_t argc = 0;
zval *args;
dom_object *intern;

if (zend_parse_parameters(ZEND_NUM_ARGS(), "*", &args, &argc) == FAILURE) {
RETURN_THROWS();
}

DOM_GET_THIS_INTERN(intern);

dom_parent_node_prepend(intern, args, argc);
}
/* }}} */

/* {{{ URL: https://dom.spec.whatwg.org/#dom-parentnode-replacechildren
Since:
*/
PHP_METHOD(DOMDocumentFragment, replaceChildren)
{
uint32_t argc = 0;
zval *args;
dom_object *intern;

if (zend_parse_parameters(ZEND_NUM_ARGS(), "*", &args, &argc) == FAILURE) {
RETURN_THROWS();
}

DOM_GET_THIS_INTERN(intern);

dom_parent_node_replace_children(intern, args, argc);
}
/* }}} */

#endif
41 changes: 33 additions & 8 deletions ext/dom/php_dom.stub.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,13 +471,22 @@ public function __construct() {}
/** @tentative-return-type */
public function appendXML(string $data): bool {}

/** @param DOMNode|string $nodes */
/**
* @param DOMNode|string $nodes
* @implementation-alias DOMElement::append
*/
public function append(...$nodes): void {}

/** @param DOMNode|string $nodes */
/**
* @param DOMNode|string $nodes
* @implementation-alias DOMElement::prepend
*/
public function prepend(...$nodes): void {}

/** @param DOMNode|string $nodes */
/**
* @param DOMNode|string $nodes
* @implementation-alias DOMDocument::replaceChildren
*/
public function replaceChildren(...$nodes): void {}
}

Expand Down Expand Up @@ -523,15 +532,25 @@ public function deleteData(int $offset, int $count): bool {}
/** @tentative-return-type */
public function replaceData(int $offset, int $count, string $data): bool {}

/** @param DOMNode|string $nodes */
/**
* @param DOMNode|string $nodes
* @implementation-alias DOMElement::replaceWith
*/
public function replaceWith(...$nodes): void {}

/** @implementation-alias DOMElement::remove */
public function remove(): void {}

/** @param DOMNode|string $nodes */
/**
* @param DOMNode|string $nodes
* @implementation-alias DOMElement::before
*/
public function before(... $nodes): void {}

/** @param DOMNode|string $nodes */
/**
* @param DOMNode|string $nodes
* @implementation-alias DOMElement::after
*/
public function after(...$nodes): void {}
}

Expand Down Expand Up @@ -829,10 +848,16 @@ public function xinclude(int $options = 0): int|false {}
/** @tentative-return-type */
public function adoptNode(DOMNode $node): DOMNode|false {}

/** @param DOMNode|string $nodes */
/**
* @param DOMNode|string $nodes
* @implementation-alias DOMElement::append
*/
public function append(...$nodes): void {}

/** @param DOMNode|string $nodes */
/**
* @param DOMNode|string $nodes
* @implementation-alias DOMElement::prepend
*/
public function prepend(...$nodes): void {}

/** @param DOMNode|string $nodes */
Expand Down
43 changes: 17 additions & 26 deletions ext/dom/php_dom_arginfo.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.