diff options
| author | Ondřej Surý <ondrej@sury.org> | 2014-08-14 16:47:40 +0200 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2014-08-14 16:47:40 +0200 |
| commit | dee9227b6f6c89113e8964649afaf57c2ebf1027 (patch) | |
| tree | 72a2baeb28b2057b89e189a46fb488dec487223c /ext/spl | |
| parent | b60f6e95a473d1ae97fdf20cec4cfefc06b24ec2 (diff) | |
| download | php-dee9227b6f6c89113e8964649afaf57c2ebf1027.tar.gz | |
New upstream version 5.6.0~rc4+dfsgupstream/5.6.0_rc4+dfsg
Diffstat (limited to 'ext/spl')
| -rw-r--r-- | ext/spl/spl_iterators.c | 2 | ||||
| -rw-r--r-- | ext/spl/tests/spl_caching_iterator_constructor_flags.phpt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c index 3ca0bda3b..f51d6c246 100644 --- a/ext/spl/spl_iterators.c +++ b/ext/spl/spl_iterators.c @@ -1480,7 +1480,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 499cd6755..dcb4287c4 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=== |