clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.2'

Browse Source 
* PHP-7.2:
  Fixed bug #74519 strange behavior of AppendIterator
This commit is contained in:
Joe 2018-02-08 10:18:45 +01:00
commit 748c40867b
No known key found for this signature in database
GPG Key ID: F9BA0ADA31CBD89E
3 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -153,6 +153,7 @@ PHP NEWS
may hide parse error). (Nikita)
. Fixed bug #75878 (RecursiveTreeIterator::setPostfix has wrong signature).
(cmb)
. Fixed bug #74519 (strange behavior of AppendIterator). (jhdxr)
- SQLite3:
. Updated bundled libsqlite to 3.22.0. (cmb)

26
ext/spl/spl_iterators.c
View File

@ -1798,7 +1798,6 @@ SPL_METHOD(dual_it, key)
proto mixed ParentIterator::current()
proto mixed IteratorIterator::current()
proto mixed NoRewindIterator::current()
proto mixed AppendIterator::current()
Get the current element value */
SPL_METHOD(dual_it, current)
{
@ -3396,6 +3395,29 @@ SPL_METHOD(AppendIterator, append)
}
} /* }}} */
/* {{{ proto mixed AppendIterator::current()
Get the current element value */
SPL_METHOD(AppendIterator, current)
{
spl_dual_it_object *intern;
if (zend_parse_parameters_none() == FAILURE) {
return;
}
SPL_FETCH_AND_CHECK_DUAL_IT(intern, getThis());
spl_dual_it_fetch(intern, 1);
if (Z_TYPE(intern->current.data) != IS_UNDEF) {
zval *value = &intern->current.data;
ZVAL_DEREF(value);
ZVAL_COPY(return_value, value);
} else {
RETURN_NULL();
}
} /* }}} */
/* {{{ proto void AppendIterator::rewind()
Rewind to the first iterator and rewind the first iterator, too */
SPL_METHOD(AppendIterator, rewind)
@ -3488,7 +3510,7 @@ static const zend_function_entry spl_funcs_AppendIterator[] = {
SPL_ME(AppendIterator, rewind, arginfo_recursive_it_void, ZEND_ACC_PUBLIC)
SPL_ME(AppendIterator, valid, arginfo_recursive_it_void, ZEND_ACC_PUBLIC)
SPL_ME(dual_it, key, arginfo_recursive_it_void, ZEND_ACC_PUBLIC)
SPL_ME(dual_it, current, arginfo_recursive_it_void, ZEND_ACC_PUBLIC)
SPL_ME(AppendIterator, current, arginfo_recursive_it_void, ZEND_ACC_PUBLIC)
SPL_ME(AppendIterator, next, arginfo_recursive_it_void, ZEND_ACC_PUBLIC)
SPL_ME(dual_it, getInnerIterator, arginfo_recursive_it_void, ZEND_ACC_PUBLIC)
SPL_ME(AppendIterator, getIteratorIndex, arginfo_recursive_it_void, ZEND_ACC_PUBLIC)

23
ext/spl/tests/bug74519.phpt Normal file
View File

@ -0,0 +1,23 @@
--TEST--
Bug #74519 strange behavior of AppendIterator
--FILE--
<?php
$iterator = new \AppendIterator();
$events = new \ArrayIterator([1,2,3,4,5]);
$iterator->append($events);
$events->next();
while($iterator->valid()) {
echo $iterator->current(), "\n";
$iterator->next();
}
?>
===DONE===
--EXPECT--
2
3
4
5
===DONE===