archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

DOMNamedNodeMap::count() cannot return false

Browse source
This commit is contained in:
Nikita Popov 2021-07-16 16:27:53 +02:00
parent f089e8afbd
commit 4cf0269e4e
3 changed files with 31 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

61
ext/dom/namednodemap.c
View file

@ -31,6 +31,33 @@
* Since:
*/
static int get_namednodemap_length(dom_object *obj)
{
dom_nnodemap_object *objmap = (dom_nnodemap_object *) obj->ptr;
if (!objmap) {
return 0;
}
if (objmap->nodetype == XML_NOTATION_NODE || objmap->nodetype == XML_ENTITY_NODE) {
return objmap->ht ? xmlHashSize(objmap->ht) : 0;
}
int count = 0;
xmlNodePtr nodep = dom_object_get_node(objmap->baseobj);
if (nodep) {
xmlAttrPtr curnode = nodep->properties;
if (curnode) {
count++;
while (curnode->next != NULL) {
count++;
curnode = curnode->next;
}
}
}
return count;
}
/* {{{ length int
readonly=yes
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-6D0FB19E
@ -38,35 +65,7 @@ Since:
*/
int dom_namednodemap_length_read(dom_object *obj, zval *retval)
{
dom_nnodemap_object *objmap;
xmlAttrPtr curnode;
xmlNodePtr nodep;
int count = 0;
objmap = (dom_nnodemap_object *)obj->ptr;
if (objmap != NULL) {
if ((objmap->nodetype == XML_NOTATION_NODE) ||
objmap->nodetype == XML_ENTITY_NODE) {
if (objmap->ht) {
count = xmlHashSize(objmap->ht);
}
} else {
nodep = dom_object_get_node(objmap->baseobj);
if (nodep) {
curnode = nodep->properties;
if (curnode) {
count++;
while (curnode->next != NULL) {
count++;
curnode = curnode->next;
}
}
}
}
}
ZVAL_LONG(retval, count);
ZVAL_LONG(retval, get_namednodemap_length(obj));
return SUCCESS;
}
@ -255,9 +254,7 @@ PHP_METHOD(DOMNamedNodeMap, count)
}
intern = Z_DOMOBJ_P(id);
if(dom_namednodemap_length_read(intern, return_value) == FAILURE) {
RETURN_FALSE;
}
RETURN_LONG(get_namednodemap_length(intern));
}
/* }}} end dom_namednodemap_count */

2
ext/dom/php_dom.stub.php
View file

@ -602,7 +602,7 @@ class DOMNamedNodeMap implements IteratorAggregate, Countable
/** @return DOMNode|null */
public function item(int $index) {}
/** @return int|false */
/** @return int */
public function count() {}
public function getIterator(): Iterator {}

2
ext/dom/php_dom_arginfo.h
View file

@ -1,5 +1,5 @@
/* This is a generated file, edit the .stub.php file instead.
* Stub hash: ba5090af41bb2cb6307a636c2e34cf324f785d61 */
* Stub hash: 98af31a563c0e793308c583a80a1be77c4965e82 */
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_dom_import_simplexml, 0, 1, DOMElement, 1)
ZEND_ARG_TYPE_INFO(0, node, IS_OBJECT, 0)