Fixed bug #67813 (CachingIterator::__construct InvalidArgumentException wrong message)

diff --git a/NEWS b/NEWS
index 2d7614d63b951c71bf18e236d26314afc194cac3..34df29b2c56bb6c7aeb332d39e00619a55acdec0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,10 @@ PHP                                                                        NEWS
   . Fixed bug #41631 (socket timeouts not honored in blocking SSL reads)
     (Daniel Lowrey).
 
+- SPL:
+  . Fixed bug #67813 (CachingIterator::__construct InvalidArgumentException
+    wrong message). (tim_siebels_aurich at yahoo dot de)
+
 ?? ??? 2014, PHP 5.5.16
 
 - COM:

diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
index 7c20352e991bfa5aa0cb9fd1f62a936710a2a6c6..87a448ca64eb155c2e23f160cb2eaba857a3e0ce 100644 (file)
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
@@ -1414,7 +1414,7 @@ static spl_dual_it_object* spl_dual_it_construct(INTERNAL_FUNCTION_PARAMETERS, z
                                return NULL;
                        }
                        if (spl_cit_check_flags(flags) != SUCCESS) {
-                               zend_throw_exception(spl_ce_InvalidArgumentException, "Flags must contain only one of CALL_TOSTRING, TOSTRING_USE_KEY, TOSTRING_USE_CURRENT, TOSTRING_USE_CURRENT", 0 TSRMLS_CC);
+                               zend_throw_exception(spl_ce_InvalidArgumentException, "Flags must contain only one of CALL_TOSTRING, TOSTRING_USE_KEY, TOSTRING_USE_CURRENT, TOSTRING_USE_INNER", 0 TSRMLS_CC);
                                zend_restore_error_handling(&error_handling TSRMLS_CC);
                                return NULL;
                        }

diff --git a/ext/spl/tests/spl_caching_iterator_constructor_flags.phpt b/ext/spl/tests/spl_caching_iterator_constructor_flags.phpt
index 499cd6755933abfb527a0107c0d587ea07c93bf8..dcb4287c45d4db7515ac5c759f1030323c0b34c8 100644 (file)
--- a/ext/spl/tests/spl_caching_iterator_constructor_flags.phpt
+++ b/ext/spl/tests/spl_caching_iterator_constructor_flags.phpt
@@ -21,5 +21,5 @@ $test = new CachingIterator($arrayIterator, 3); // this throws an exception
 ?>
 ===DONE===
 --EXPECTF--
-Flags must contain only one of CALL_TOSTRING, TOSTRING_USE_KEY, TOSTRING_USE_CURRENT, TOSTRING_USE_CURRENT
+Flags must contain only one of CALL_TOSTRING, TOSTRING_USE_KEY, TOSTRING_USE_CURRENT, TOSTRING_USE_INNER
 ===DONE===