From 9c207a97d4e936a80e86107eb6280fce68492183 Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Mon, 25 Mar 2024 10:49:06 +0100 Subject: [PATCH 1/2] DOM stubs: Reference interfaces from the global namespace correctly --- ext/dom/php_dom.stub.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ext/dom/php_dom.stub.php b/ext/dom/php_dom.stub.php index bb72a3586fb8d..196a858817572 100644 --- a/ext/dom/php_dom.stub.php +++ b/ext/dom/php_dom.stub.php @@ -1218,7 +1218,7 @@ public function __sleep(): array {} public function __wakeup(): void {} } - class NodeList implements IteratorAggregate, Countable + class NodeList implements \IteratorAggregate, \Countable { /** @readonly */ public int $length; @@ -1233,7 +1233,7 @@ public function getIterator(): \Iterator {} public function item(int $index): ?Node {} } - class NamedNodeMap implements IteratorAggregate, Countable + class NamedNodeMap implements \IteratorAggregate, \Countable { /** @readonly */ public int $length; @@ -1252,7 +1252,7 @@ public function count(): int {} public function getIterator(): \Iterator {} } - class DTDNamedNodeMap implements IteratorAggregate, Countable + class DTDNamedNodeMap implements \IteratorAggregate, \Countable { /** @readonly */ public int $length; @@ -1271,7 +1271,7 @@ public function count(): int {} public function getIterator(): \Iterator {} } - class HTMLCollection implements IteratorAggregate, Countable + class HTMLCollection implements \IteratorAggregate, \Countable { /** @readonly */ public int $length; From ca4710060603efeaa38ff6749b5f5d9b83b84097 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20D=C3=BCsterhus?= Date: Mon, 25 Mar 2024 11:38:03 +0100 Subject: [PATCH 2/2] [skip] Regenerate arginfo --- ext/dom/php_dom_arginfo.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ext/dom/php_dom_arginfo.h b/ext/dom/php_dom_arginfo.h index 257f63004958d..a386d5217dc9b 100644 --- a/ext/dom/php_dom_arginfo.h +++ b/ext/dom/php_dom_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: 59b592b969e62100af3e3d73212cf513ab8d3ab8 */ + * Stub hash: f441c789fdce91e8fc71f450b294c11059999af1 */ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_dom_import_simplexml, 0, 1, DOMElement, 0) ZEND_ARG_TYPE_INFO(0, node, IS_OBJECT, 0) @@ -2885,13 +2885,13 @@ static zend_class_entry *register_class_DOM_Node(void) return class_entry; } -static zend_class_entry *register_class_DOM_NodeList(zend_class_entry *class_entry_DOM_IteratorAggregate, zend_class_entry *class_entry_DOM_Countable) +static zend_class_entry *register_class_DOM_NodeList(zend_class_entry *class_entry_IteratorAggregate, zend_class_entry *class_entry_Countable) { zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "DOM", "NodeList", class_DOM_NodeList_methods); class_entry = zend_register_internal_class_ex(&ce, NULL); - zend_class_implements(class_entry, 2, class_entry_DOM_IteratorAggregate, class_entry_DOM_Countable); + zend_class_implements(class_entry, 2, class_entry_IteratorAggregate, class_entry_Countable); zval property_length_default_value; ZVAL_UNDEF(&property_length_default_value); @@ -2902,13 +2902,13 @@ static zend_class_entry *register_class_DOM_NodeList(zend_class_entry *class_ent return class_entry; } -static zend_class_entry *register_class_DOM_NamedNodeMap(zend_class_entry *class_entry_DOM_IteratorAggregate, zend_class_entry *class_entry_DOM_Countable) +static zend_class_entry *register_class_DOM_NamedNodeMap(zend_class_entry *class_entry_IteratorAggregate, zend_class_entry *class_entry_Countable) { zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "DOM", "NamedNodeMap", class_DOM_NamedNodeMap_methods); class_entry = zend_register_internal_class_ex(&ce, NULL); - zend_class_implements(class_entry, 2, class_entry_DOM_IteratorAggregate, class_entry_DOM_Countable); + zend_class_implements(class_entry, 2, class_entry_IteratorAggregate, class_entry_Countable); zval property_length_default_value; ZVAL_UNDEF(&property_length_default_value); @@ -2919,13 +2919,13 @@ static zend_class_entry *register_class_DOM_NamedNodeMap(zend_class_entry *class return class_entry; } -static zend_class_entry *register_class_DOM_DTDNamedNodeMap(zend_class_entry *class_entry_DOM_IteratorAggregate, zend_class_entry *class_entry_DOM_Countable) +static zend_class_entry *register_class_DOM_DTDNamedNodeMap(zend_class_entry *class_entry_IteratorAggregate, zend_class_entry *class_entry_Countable) { zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "DOM", "DTDNamedNodeMap", class_DOM_DTDNamedNodeMap_methods); class_entry = zend_register_internal_class_ex(&ce, NULL); - zend_class_implements(class_entry, 2, class_entry_DOM_IteratorAggregate, class_entry_DOM_Countable); + zend_class_implements(class_entry, 2, class_entry_IteratorAggregate, class_entry_Countable); zval property_length_default_value; ZVAL_UNDEF(&property_length_default_value); @@ -2936,13 +2936,13 @@ static zend_class_entry *register_class_DOM_DTDNamedNodeMap(zend_class_entry *cl return class_entry; } -static zend_class_entry *register_class_DOM_HTMLCollection(zend_class_entry *class_entry_DOM_IteratorAggregate, zend_class_entry *class_entry_DOM_Countable) +static zend_class_entry *register_class_DOM_HTMLCollection(zend_class_entry *class_entry_IteratorAggregate, zend_class_entry *class_entry_Countable) { zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "DOM", "HTMLCollection", class_DOM_HTMLCollection_methods); class_entry = zend_register_internal_class_ex(&ce, NULL); - zend_class_implements(class_entry, 2, class_entry_DOM_IteratorAggregate, class_entry_DOM_Countable); + zend_class_implements(class_entry, 2, class_entry_IteratorAggregate, class_entry_Countable); zval property_length_default_value; ZVAL_UNDEF(&property_length_default_value);