archived
/
ext-collections
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix `retainAll()`. Update .gitignore

This commit is contained in:
CismonX 2018-08-16 20:17:13 +08:00
parent 5e3518a5ec
commit f0cc4fda1b
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -15,6 +15,7 @@ config.status
config.sub config.sub
configure configure
configure.in configure.in
configure.ac
include include
install-sh install-sh
libtool libtool

8
src/collections_methods.c
View File

@ -1857,17 +1857,11 @@ PHP_METHOD(Collection, retainAll)
{ {
zend_fcall_info fci; zend_fcall_info fci;
zend_fcall_info_cache fcc; zend_fcall_info_cache fcc;
ZEND_PARSE_PARAMETERS_START(0, 1) ZEND_PARSE_PARAMETERS_START(1, 1)
Z_PARAM_OPTIONAL
Z_PARAM_FUNC(fci, fcc) Z_PARAM_FUNC(fci, fcc)
ZEND_PARSE_PARAMETERS_END(); ZEND_PARSE_PARAMETERS_END();
zend_array* current = COLLECTION_FETCH_CURRENT(); zend_array* current = COLLECTION_FETCH_CURRENT();
SEPARATE_CURRENT_COLLECTION(current); SEPARATE_CURRENT_COLLECTION(current);
if (EX_NUM_ARGS() == 0)
{
zend_hash_clean(current);
return;
}
INIT_FCI(&fci, 2); INIT_FCI(&fci, 2);
ZEND_HASH_FOREACH_BUCKET(current, Bucket* bucket) ZEND_HASH_FOREACH_BUCKET(current, Bucket* bucket)
CALLBACK_KEYVAL_INVOKE(params, bucket); CALLBACK_KEYVAL_INVOKE(params, bucket);