mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-10 21:14:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

- Remove duplicate error message and add new test

Browse Source
This commit is contained in:
Marcus Boerger 2006-05-21 12:42:00 +00:00
parent 223dce98a5
commit 97e798257a
2 changed files with 105 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/spl/spl_iterators.c
View File

@ -2306,7 +2306,7 @@ SPL_METHOD(AppendIterator, append)
APPENDIT_CHECK_CTOR(intern);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &it, zend_ce_iterator) == FAILURE) {
if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "O", &it, zend_ce_iterator) == FAILURE) {
return;
}
spl_array_iterator_append(intern->u.append.zarrayit, it TSRMLS_CC);

104
ext/spl/tests/iterator_042.phpt Executable file
View File

@ -0,0 +1,104 @@
--TEST--
SPL: AppendIterator and its ArrayIterator
--SKIPIF--
<?php if (!extension_loaded("spl")) print "skip"; ?>
--FILE--
<?php
function test_error_handler($errno, $msg, $filename, $linenum, $vars)
{
echo "Error $msg in $filename on line $linenum\n";
return true;
}
set_error_handler('test_error_handler');
$it = new AppendIterator;
$it->append(array());
$it->append(new ArrayIterator(array(1)));
$it->append(new ArrayIterator(array(21, 22)));
var_dump($it->getArrayIterator());
$it->append(new ArrayIterator(array(31, 32, 33)));
var_dump($it->getArrayIterator());
$idx = 0;
foreach($it as $k => $v)
{
echo '===' . $idx++ . "===\n";
var_dump($it->getIteratorIndex());
var_dump($k);
var_dump($v);
}
?>
===DONE===
<?php exit(0); ?>
--EXPECTF--
Error Argument 1 passed to AppendIterator::append() must implement interface Iterator, array given in %siterator_042.php on line %d
object(ArrayIterator)#%d (2) {
[0]=>
object(ArrayIterator)#%d (1) {
[0]=>
int(1)
}
[1]=>
object(ArrayIterator)#%d (2) {
[0]=>
int(21)
[1]=>
int(22)
}
}
object(ArrayIterator)#%d (3) {
[0]=>
object(ArrayIterator)#%d (1) {
[0]=>
int(1)
}
[1]=>
object(ArrayIterator)#%d (2) {
[0]=>
int(21)
[1]=>
int(22)
}
[2]=>
object(ArrayIterator)#5 (3) {
[0]=>
int(31)
[1]=>
int(32)
[2]=>
int(33)
}
}
===0===
int(0)
int(0)
int(1)
===1===
int(1)
int(0)
int(21)
===2===
int(1)
int(1)
int(22)
===3===
int(2)
int(0)
int(31)
===4===
int(2)
int(1)
int(32)
===5===
int(2)
int(2)
int(33)
===DONE===