Commit: cce4764f138bd303e9fdf69d3dcc3d0cb377ead6 Author: Nikita Popov <ni...@php.net> Tue, 19 Jun 2012 18:08:22 +0200 Parents: 34bd1c941b4124f80ef25fdfbb08702f89913d68 4cba4c61931caf4abb1599493fdcbb2b492072f0 Branches: PHP-5.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=cce4764f138bd303e9fdf69d3dcc3d0cb377ead6 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Fixed bug RecursiveArrayIterator does not implement Countable Conflicts: ext/spl/spl_array.c Changed paths: MM ext/spl/spl_array.c Diff: diff --cc ext/spl/spl_array.c index e448731,5bbab90..84977c4 --- a/ext/spl/spl_array.c +++ b/ext/spl/spl_array.c @@@ -1943,6 -2005,9 +1943,7 @@@ PHP_MINIT_FUNCTION(spl_array REGISTER_SPL_IMPLEMENTS(ArrayObject, Aggregate); REGISTER_SPL_IMPLEMENTS(ArrayObject, ArrayAccess); REGISTER_SPL_IMPLEMENTS(ArrayObject, Serializable); + REGISTER_SPL_IMPLEMENTS(ArrayObject, Countable); - spl_ce_ArrayObject->serialize = spl_array_serialize; - spl_ce_ArrayObject->unserialize = spl_array_unserialize; memcpy(&spl_handler_ArrayObject, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); spl_handler_ArrayObject.clone_obj = spl_array_object_clone; @@@ -1967,6 -2032,9 +1968,7 @@@ REGISTER_SPL_IMPLEMENTS(ArrayIterator, ArrayAccess); REGISTER_SPL_IMPLEMENTS(ArrayIterator, SeekableIterator); REGISTER_SPL_IMPLEMENTS(ArrayIterator, Serializable); + REGISTER_SPL_IMPLEMENTS(ArrayIterator, Countable); - spl_ce_ArrayIterator->serialize = spl_array_serialize; - spl_ce_ArrayIterator->unserialize = spl_array_unserialize; memcpy(&spl_handler_ArrayIterator, &spl_handler_ArrayObject, sizeof(zend_object_handlers)); spl_ce_ArrayIterator->get_iterator = spl_array_get_iterator; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
