svn: /php/php-src/ branches/PHP_5_4/NEWS branches/PHP_5_4/ext/spl/php_spl.c branches/PHP_5_4/ext/spl/spl_iterators.h trunk/ext/spl/php_spl.c
trunk/ext/spl/spl_iterators.h

salathe Wed, 27 Jul 2011 08:48:08 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=313763 Log: added (recursive)callbackfilteriterator to spl_classes() (bug #55287) Bug: https://bugs.php.net/55287 (Open) trunk's spl_classes() not includes CallbackFilter classes Changed paths: U php/php-src/branches/PHP_5_4/NEWS U php/php-src/branches/PHP_5_4/ext/spl/php_spl.c U php/php-src/branches/PHP_5_4/ext/spl/spl_iterators.h U php/php-src/trunk/ext/spl/php_spl.c U php/php-src/trunk/ext/spl/spl_iterators.h Modified: php/php-src/branches/PHP_5_4/NEWS =================================================================== --- php/php-src/branches/PHP_5_4/NEWS 2011-07-27 08:09:24 UTC (rev 313762) +++ php/php-src/branches/PHP_5_4/NEWS 2011-07-27 08:48:08 UTC (rev 313763) @@ -25,6 +25,8 @@ - SPL extension: . Added missing class_uses(..) as pointed out by #55266 (Stefan) + . Fixed bug #55287 (spl_classes() not includes CallbackFilter classes) + (sasezaki at gmail dot com, salathe) 14 Jul 2011, PHP 5.4.0 Alpha 2 Modified: php/php-src/branches/PHP_5_4/ext/spl/php_spl.c =================================================================== --- php/php-src/branches/PHP_5_4/ext/spl/php_spl.c 2011-07-27 08:09:24 UTC (rev 313762) +++ php/php-src/branches/PHP_5_4/ext/spl/php_spl.c 2011-07-27 08:48:08 UTC (rev 313763) @@ -205,6 +205,7 @@ SPL_ADD_CLASS(BadFunctionCallException, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(BadMethodCallException, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(CachingIterator, z_list, sub, allow, ce_flags); \ + SPL_ADD_CLASS(CallbackFilterIterator, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(Countable, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(DirectoryIterator, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(DomainException, z_list, sub, allow, ce_flags); \ @@ -228,6 +229,7 @@ SPL_ADD_CLASS(RangeException, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(RecursiveArrayIterator, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(RecursiveCachingIterator, z_list, sub, allow, ce_flags); \ + SPL_ADD_CLASS(RecursiveCallbackFilterIterator, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(RecursiveDirectoryIterator, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(RecursiveFilterIterator, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(RecursiveIterator, z_list, sub, allow, ce_flags); \ Modified: php/php-src/branches/PHP_5_4/ext/spl/spl_iterators.h =================================================================== --- php/php-src/branches/PHP_5_4/ext/spl/spl_iterators.h 2011-07-27 08:09:24 UTC (rev 313762) +++ php/php-src/branches/PHP_5_4/ext/spl/spl_iterators.h 2011-07-27 08:48:08 UTC (rev 313763) @@ -52,6 +52,8 @@ extern PHPAPI zend_class_entry *spl_ce_RegexIterator; extern PHPAPI zend_class_entry *spl_ce_RecursiveRegexIterator; extern PHPAPI zend_class_entry *spl_ce_Countable; +extern PHPAPI zend_class_entry *spl_ce_CallbackFilterIterator; +extern PHPAPI zend_class_entry *spl_ce_RecursiveCallbackFilterIterator; PHP_MINIT_FUNCTION(spl_iterators); Modified: php/php-src/trunk/ext/spl/php_spl.c =================================================================== --- php/php-src/trunk/ext/spl/php_spl.c 2011-07-27 08:09:24 UTC (rev 313762) +++ php/php-src/trunk/ext/spl/php_spl.c 2011-07-27 08:48:08 UTC (rev 313763) @@ -205,6 +205,7 @@ SPL_ADD_CLASS(BadFunctionCallException, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(BadMethodCallException, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(CachingIterator, z_list, sub, allow, ce_flags); \ + SPL_ADD_CLASS(CallbackFilterIterator, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(Countable, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(DirectoryIterator, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(DomainException, z_list, sub, allow, ce_flags); \ @@ -228,6 +229,7 @@ SPL_ADD_CLASS(RangeException, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(RecursiveArrayIterator, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(RecursiveCachingIterator, z_list, sub, allow, ce_flags); \ + SPL_ADD_CLASS(RecursiveCallbackFilterIterator, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(RecursiveDirectoryIterator, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(RecursiveFilterIterator, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(RecursiveIterator, z_list, sub, allow, ce_flags); \ Modified: php/php-src/trunk/ext/spl/spl_iterators.h =================================================================== --- php/php-src/trunk/ext/spl/spl_iterators.h 2011-07-27 08:09:24 UTC (rev 313762) +++ php/php-src/trunk/ext/spl/spl_iterators.h 2011-07-27 08:48:08 UTC (rev 313763) @@ -52,6 +52,8 @@ extern PHPAPI zend_class_entry *spl_ce_RegexIterator; extern PHPAPI zend_class_entry *spl_ce_RecursiveRegexIterator; extern PHPAPI zend_class_entry *spl_ce_Countable; +extern PHPAPI zend_class_entry *spl_ce_CallbackFilterIterator; +extern PHPAPI zend_class_entry *spl_ce_RecursiveCallbackFilterIterator; PHP_MINIT_FUNCTION(spl_iterators);