svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/simplexml/simplexml.c trunk/ext/simplexml/simplexml.c

pajoye Mon, 23 Aug 2010 17:01:44 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=302715 Log: - revert fix for #52655, rev. 302614 Bug: http://bugs.php.net/52655 (Closed) SimpleXMLIterator supports ArrayAccess without implementing Interface Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/simplexml/simplexml.c U php/php-src/trunk/ext/simplexml/simplexml.c Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2010-08-23 16:54:57 UTC (rev 302714) +++ php/php-src/branches/PHP_5_3/NEWS 2010-08-23 17:01:44 UTC (rev 302715) @@ -15,8 +15,6 @@ - Changed the $context parameter on copy() to actually have an effect. (Kalle) - Fixed possible crash in mssql_fetch_batch(). (Kalle) -- Fixed bug #52655 (SimpleXMLIterator supports ArrayAccess without implementing - the interface). (Kalle) - Fixed bug #52654 (mysqli doesn't install headers with structures it uses). (Andrey) - Fixed bug #52636 (php_mysql_fetch_hash writes long value into int). Modified: php/php-src/branches/PHP_5_3/ext/simplexml/simplexml.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/simplexml/simplexml.c 2010-08-23 16:54:57 UTC (rev 302714) +++ php/php-src/branches/PHP_5_3/ext/simplexml/simplexml.c 2010-08-23 17:01:44 UTC (rev 302715) @@ -2536,7 +2536,7 @@ sxe_class_entry = zend_register_internal_class(&sxe TSRMLS_CC); sxe_class_entry->get_iterator = php_sxe_get_iterator; sxe_class_entry->iterator_funcs.funcs = &php_sxe_iterator_funcs; - zend_class_implements(sxe_class_entry TSRMLS_CC, 2, zend_ce_traversable, zend_ce_arrayaccess); + zend_class_implements(sxe_class_entry TSRMLS_CC, 1, zend_ce_traversable); sxe_object_handlers.get_method = zend_get_std_object_handlers()->get_method; sxe_object_handlers.get_constructor = zend_get_std_object_handlers()->get_constructor; sxe_object_handlers.get_class_entry = zend_get_std_object_handlers()->get_class_entry; Modified: php/php-src/trunk/ext/simplexml/simplexml.c =================================================================== --- php/php-src/trunk/ext/simplexml/simplexml.c 2010-08-23 16:54:57 UTC (rev 302714) +++ php/php-src/trunk/ext/simplexml/simplexml.c 2010-08-23 17:01:44 UTC (rev 302715) @@ -2536,7 +2536,7 @@ sxe_class_entry = zend_register_internal_class(&sxe TSRMLS_CC); sxe_class_entry->get_iterator = php_sxe_get_iterator; sxe_class_entry->iterator_funcs.funcs = &php_sxe_iterator_funcs; - zend_class_implements(sxe_class_entry TSRMLS_CC, 2, zend_ce_traversable, zend_ce_arrayaccess); + zend_class_implements(sxe_class_entry TSRMLS_CC, 1, zend_ce_traversable); sxe_object_handlers.get_method = zend_get_std_object_handlers()->get_method; sxe_object_handlers.get_constructor = zend_get_std_object_handlers()->get_constructor; sxe_object_handlers.get_class_entry = zend_get_std_object_handlers()->get_class_entry;