com php-src: Fixed bug #67813 (CachingIterator::__con struct InvalidArgumentException wrong message): NEW S ext/spl/spl_iterators.c
ext/spl/tests/spl_caching _iterator_constructor_flags.phpt

Commit: b6ddcf9c7176f6cca06804c747c08bee89980e44 Author: Xinchen Hui <laruence@php.net> Mon, 11 Aug 2014 17:46:56 +0800 Parents: d4df6d02003c3eef4751f579cfc462ac8b398cf0 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b6ddcf9c7176f6cca06804c747c08bee89980e44 Log: Fixed bug #67813 (CachingIterator::__construct InvalidArgumentException wrong message) Bugs: https://bugs.php.net/67813 Changed paths: M NEWS M ext/spl/spl_iterators.c M ext/spl/tests/spl_caching_iterator_constructor_flags.phpt Diff: diff --git a/NEWS b/NEWS index 2d7614d..34df29b 100644 --- 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 7c20352..87a448c 100644 --- 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 499cd67...dcb4287 100644 --- 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===