- Match code with docu

diff --git a/ext/spl/internal/recursiveregexiterator.inc b/ext/spl/internal/recursiveregexiterator.inc
index 21e7599a7d3b645577e9ed2e83360d9651360f29..bab8cab460ce65732984dc6a37544f76d61c14f4 100755 (executable)
--- a/ext/spl/internal/recursiveregexiterator.inc
+++ b/ext/spl/internal/recursiveregexiterator.inc
@@ -25,14 +25,14 @@ class RecursiveRegexIterator extends RegexIterator implements RecursiveIterator
         *
         * @param it          inner iterator
         * @param regex       the regular expression to match
-        * @param flags       special flags (self::USE_KEY)
         * @param mode        operation mode (one of self::MATCH, self::GET_MATCH, 
         *                    self::ALL_MATCHES, self::SPLIT)
+        * @param flags       special flags (self::USE_KEY)
         * @param preg_flags  global PREG_* flags, see preg_match(), 
         *                    preg_match_all(), preg_split()
         */
-       function __construct(RecursiveIterator $it, $regex, $flags = 0, $mode = 0, $preg_flags = 0) {
-               parent::__construct($it, $regex, $flags, $mode, $preg_flags);
+       function __construct(RecursiveIterator $it, $regex, $mode = 0, $flags = 0, $preg_flags = 0) {
+               parent::__construct($it, $regex, $mode, $flags, $preg_flags);
        }
 
        /** @return whether the current element has children

diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
index 869f0efdab166ebd47c8f6bd9351aecb576c9a38..ccda8aa96c9c3e00efdd473519c907d8de74e3de 100755 (executable)
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
@@ -1739,7 +1739,9 @@ static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_rec_regex_it___construct, 0, 0, 2) 
        ZEND_ARG_OBJ_INFO(0, iterator, RecursiveIterator, 0)
        ZEND_ARG_INFO(0, regex)
+       ZEND_ARG_INFO(0, mode)
        ZEND_ARG_INFO(0, flags)
+       ZEND_ARG_INFO(0, preg_flags)
 ZEND_END_ARG_INFO();
 
 static zend_function_entry spl_funcs_RecursiveRegexIterator[] = {
@@ -2904,6 +2906,7 @@ PHP_MINIT_FUNCTION(spl_iterators)
 
        REGISTER_SPL_STD_CLASS_EX(IteratorIterator, spl_dual_it_new, spl_funcs_IteratorIterator);
        REGISTER_SPL_ITERATOR(IteratorIterator);
+       REGISTER_SPL_IMPLEMENTS(IteratorIterator, OuterIterator);
 
        REGISTER_SPL_SUB_CLASS_EX(FilterIterator, IteratorIterator, spl_dual_it_new, spl_funcs_FilterIterator);
        spl_ce_FilterIterator->ce_flags |= ZEND_ACC_EXPLICIT_ABSTRACT_CLASS;