diff options
| author | Peter Cowburn <salathe@php.net> | 2011-07-27 08:48:08 +0000 |
|---|---|---|
| committer | Peter Cowburn <salathe@php.net> | 2011-07-27 08:48:08 +0000 |
| commit | 9159e3d2460be80e47e408400fc77ae15c4f48f8 (patch) | |
| tree | 951e3fd778fba5ad81167ceb0ee333a28ced487f | |
| parent | 741abeb20f4091fcc9d1d7072a8c1d4ce4fac4ee (diff) | |
| download | php-git-9159e3d2460be80e47e408400fc77ae15c4f48f8.tar.gz | |
added (recursive)callbackfilteriterator to spl_classes() (bug #55287)
| -rw-r--r-- | NEWS | 2 | ||||
| -rwxr-xr-x | ext/spl/php_spl.c | 2 | ||||
| -rwxr-xr-x | ext/spl/spl_iterators.h | 2 |
3 files changed, 6 insertions, 0 deletions
@@ -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 diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c index 5caa4c9825..96615b6136 100755 --- a/ext/spl/php_spl.c +++ b/ext/spl/php_spl.c @@ -205,6 +205,7 @@ PHP_FUNCTION(class_uses) 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 @@ PHP_FUNCTION(class_uses) 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); \ diff --git a/ext/spl/spl_iterators.h b/ext/spl/spl_iterators.h index 9bbdd68751..8860a11924 100755 --- a/ext/spl/spl_iterators.h +++ b/ext/spl/spl_iterators.h @@ -52,6 +52,8 @@ extern PHPAPI zend_class_entry *spl_ce_AppendIterator; 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); |