added (recursive)callbackfilteriterator to spl_classes() (bug #55287)

diff --git a/NEWS b/NEWS
index ffe48b332cf1a41bc3e7662350f3d7881c118e83..8e3155262806e7e93552182c8a0e9643a97942e7 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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 5caa4c982537862bb97653479eb1d6b492dfb746..96615b6136ccb28872765c0cc82070a0184a97a6 100755 (executable)
--- 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 9bbdd68751bc836c0396abb3126a11f331499e26..8860a119241874d16aa9610723c5df75baed34a3 100755 (executable)
--- 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);