helly Tue May 9 23:55:24 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/dom dom_iterators.c php_dom.c php_dom.h
Log:
- Update after api changes
http://cvs.php.net/viewcvs.cgi/php-src/ext/dom/dom_iterators.c?r1=1.9.2.3&r2=1.9.2.3.2.1&diff_format=u
Index: php-src/ext/dom/dom_iterators.c
diff -u php-src/ext/dom/dom_iterators.c:1.9.2.3
php-src/ext/dom/dom_iterators.c:1.9.2.3.2.1
--- php-src/ext/dom/dom_iterators.c:1.9.2.3 Fri Mar 3 20:15:10 2006
+++ php-src/ext/dom/dom_iterators.c Tue May 9 23:55:24 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dom_iterators.c,v 1.9.2.3 2006/03/03 20:15:10 rrichards Exp $ */
+/* $Id: dom_iterators.c,v 1.9.2.3.2.1 2006/05/09 23:55:24 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -253,7 +253,7 @@
NULL
};
-zend_object_iterator *php_dom_get_iterator(zend_class_entry *ce, zval *object
TSRMLS_DC)
+zend_object_iterator *php_dom_get_iterator(zend_class_entry *ce, zval *object,
int by_ref TSRMLS_DC)
{
dom_object *intern;
dom_nnodemap_object *objmap;
@@ -263,6 +263,9 @@
HashTable *nodeht;
zval **entry;
+ if (by_ref) {
+ zend_error(E_ERROR, "An iterator cannot be used with foreach by
reference");
+ }
php_dom_iterator *iterator = emalloc(sizeof(php_dom_iterator));
object->refcount++;
http://cvs.php.net/viewcvs.cgi/php-src/ext/dom/php_dom.c?r1=1.73.2.12&r2=1.73.2.12.2.1&diff_format=u
Index: php-src/ext/dom/php_dom.c
diff -u php-src/ext/dom/php_dom.c:1.73.2.12
php-src/ext/dom/php_dom.c:1.73.2.12.2.1
--- php-src/ext/dom/php_dom.c:1.73.2.12 Wed May 3 08:43:04 2006
+++ php-src/ext/dom/php_dom.c Tue May 9 23:55:24 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_dom.c,v 1.73.2.12 2006/05/03 08:43:04 rrichards Exp $ */
+/* $Id: php_dom.c,v 1.73.2.12.2.1 2006/05/09 23:55:24 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -464,11 +464,7 @@
};
static zend_object_handlers* dom_get_obj_handlers(TSRMLS_D) {
- if (EG(ze1_compatibility_mode)) {
- return &dom_ze1_object_handlers;
- } else {
- return &dom_object_handlers;
- }
+ return &dom_object_handlers;
}
static zend_module_dep dom_deps[] = {
@@ -517,7 +513,7 @@
zend_hash_init(&classes, 0, NULL, NULL, 1);
INIT_CLASS_ENTRY(ce, "DOMException",
php_dom_domexception_class_functions);
- dom_domexception_class_entry = zend_register_internal_class_ex(&ce,
zend_exception_get_default(), NULL TSRMLS_CC);
+ dom_domexception_class_entry = zend_register_internal_class_ex(&ce,
zend_exception_get_default(TSRMLS_C), NULL TSRMLS_CC);
dom_domexception_class_entry->ce_flags |= ZEND_ACC_FINAL;
zend_declare_property_long(dom_domexception_class_entry, "code",
sizeof("code")-1, 0, ZEND_ACC_PUBLIC TSRMLS_CC);
http://cvs.php.net/viewcvs.cgi/php-src/ext/dom/php_dom.h?r1=1.28.2.1&r2=1.28.2.1.2.1&diff_format=u
Index: php-src/ext/dom/php_dom.h
diff -u php-src/ext/dom/php_dom.h:1.28.2.1
php-src/ext/dom/php_dom.h:1.28.2.1.2.1
--- php-src/ext/dom/php_dom.h:1.28.2.1 Sun Jan 1 12:50:06 2006
+++ php-src/ext/dom/php_dom.h Tue May 9 23:55:24 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_dom.h,v 1.28.2.1 2006/01/01 12:50:06 sniper Exp $ */
+/* $Id: php_dom.h,v 1.28.2.1.2.1 2006/05/09 23:55:24 helly Exp $ */
#ifndef PHP_DOM_H
#define PHP_DOM_H
@@ -109,7 +109,7 @@
xmlNodePtr create_notation(const xmlChar *name, const xmlChar *ExternalID,
const xmlChar *SystemID);
xmlNode *php_dom_libxml_hash_iter(xmlHashTable *ht, int index);
xmlNode *php_dom_libxml_notation_iter(xmlHashTable *ht, int index);
-zend_object_iterator *php_dom_get_iterator(zend_class_entry *ce, zval *object
TSRMLS_DC);
+zend_object_iterator *php_dom_get_iterator(zend_class_entry *ce, zval *object,
int by_ref TSRMLS_DC);
#define REGISTER_DOM_CLASS(ce, name, parent_ce, funcs, entry) \
INIT_CLASS_ENTRY(ce, name, funcs); \
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
