rrichards Tue Nov 22 22:12:47 2005 EDT
Added files: (Branch: PHP_5_1)
/php-src/ext/dom/tests bug35342.phpt
Modified files:
/php-src/ext/dom php_dom.c
Log:
Fixed bug #35342 (isset(DOMNodeList->length) returns false)
add test
http://cvs.php.net/diff.php/php-src/ext/dom/php_dom.c?r1=1.73.2.5&r2=1.73.2.6&ty=u
Index: php-src/ext/dom/php_dom.c
diff -u php-src/ext/dom/php_dom.c:1.73.2.5 php-src/ext/dom/php_dom.c:1.73.2.6
--- php-src/ext/dom/php_dom.c:1.73.2.5 Tue Nov 15 09:18:15 2005
+++ php-src/ext/dom/php_dom.c Tue Nov 22 22:12:45 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_dom.c,v 1.73.2.5 2005/11/15 14:18:15 dmitry Exp $ */
+/* $Id: php_dom.c,v 1.73.2.6 2005/11/23 03:12:45 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -346,6 +346,41 @@
}
/* }}} */
+/* {{{ dom_property_exists */
+static int dom_property_exists(zval *object, zval *member, int check_empty
TSRMLS_DC)
+{
+ dom_object *obj;
+ zval tmp_member;
+ dom_prop_handler *hnd;
+ zend_object_handlers *std_hnd;
+ int ret, retval=0;
+
+ if (member->type != IS_STRING) {
+ tmp_member = *member;
+ zval_copy_ctor(&tmp_member);
+ convert_to_string(&tmp_member);
+ member = &tmp_member;
+ }
+
+ ret = FAILURE;
+ obj = (dom_object *)zend_objects_get_address(object TSRMLS_CC);
+
+ if (obj->prop_handler != NULL) {
+ ret = zend_hash_find((HashTable *)obj->prop_handler,
Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void **) &hnd);
+ }
+ if (ret == SUCCESS) {
+ retval = 1;
+ } else {
+ std_hnd = zend_get_std_object_handlers();
+ retval = std_hnd->has_property(object, member, check_empty
TSRMLS_CC);
+ }
+
+ if (member == &tmp_member) {
+ zval_dtor(member);
+ }
+ return retval;
+}
+/* }}} */
void *php_dom_export_node(zval *object TSRMLS_DC)
{
@@ -468,12 +503,14 @@
dom_object_handlers.write_property = dom_write_property;
dom_object_handlers.get_property_ptr_ptr = dom_get_property_ptr_ptr;
dom_object_handlers.clone_obj = dom_objects_store_clone_obj;
+ dom_object_handlers.has_property = dom_property_exists;
memcpy(&dom_ze1_object_handlers, zend_get_std_object_handlers(),
sizeof(zend_object_handlers));
dom_ze1_object_handlers.read_property = dom_read_property;
dom_ze1_object_handlers.write_property = dom_write_property;
dom_object_handlers.get_property_ptr_ptr = dom_get_property_ptr_ptr;
dom_ze1_object_handlers.clone_obj = dom_objects_ze1_clone_obj;
+ dom_ze1_object_handlers.has_property = dom_property_exists;
zend_hash_init(&classes, 0, NULL, NULL, 1);
http://cvs.php.net/co.php/php-src/ext/dom/tests/bug35342.phpt?r=1.1&p=1
Index: php-src/ext/dom/tests/bug35342.phpt
+++ php-src/ext/dom/tests/bug35342.phpt
--TEST--
Bug # 35342: isset(DOMNodeList->length) returns false
--SKIPIF--
<?php require_once('skipif.php'); ?>
--FILE--
<?php
$dom = new DOMDocument();
$dom->loadXML("<root><foo>foobar</foo><foo>foobar#2</foo></root>");
$nodelist = $dom->getElementsByTagName("foo");
var_dump($nodelist->length, isset($nodelist->length), isset($nodelist->foo));
?>
--EXPECT--
int(2)
bool(true)
bool(false)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
