archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use a dedicated method for MultipleIterator::countIterators()

Browse source 
This method has a different signature from
SplObjectStorage::count(), so don't share implementations.
This commit is contained in:
Nikita Popov 2020-08-13 14:39:38 +02:00
parent f0bf3d4672
commit f3d6203b0b
3 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ext/spl/spl_observer.c
View file

@ -993,6 +993,17 @@ PHP_METHOD(MultipleIterator, containsIterator)
RETURN_BOOL(spl_object_storage_contains(intern, iterator));
} /* }}} */
PHP_METHOD(MultipleIterator, countIterators)
{
spl_SplObjectStorage *intern = Z_SPLOBJSTORAGE_P(ZEND_THIS);
if (zend_parse_parameters_none() == FAILURE) {
RETURN_THROWS();
}
RETURN_LONG(zend_hash_num_elements(&intern->storage));
}
/* {{{ Rewind all attached iterator instances */
PHP_METHOD(MultipleIterator, rewind)
{

5
ext/spl/spl_observer.stub.php
View file

@ -140,10 +140,7 @@ class MultipleIterator implements Iterator
/** @return bool */
public function containsIterator(Iterator $iterator) {}
/**
* @return int
* @alias SplObjectStorage::count
*/
/** @return int */
public function countIterators() {}
/** @return void */

5
ext/spl/spl_observer_arginfo.h
View file

@ -1,5 +1,5 @@
/* This is a generated file, edit the .stub.php file instead.
* Stub hash: 22aaae107ec0c1c81a3f7135ffd7d22507437c57 */
* Stub hash: 4a31f2cc1b0c874f1256aef60afbd285dbe6c078 */
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SplObserver_update, 0, 0, 1)
ZEND_ARG_OBJ_INFO(0, subject, SplSubject, 0)
@ -145,6 +145,7 @@ ZEND_METHOD(MultipleIterator, setFlags);
ZEND_METHOD(MultipleIterator, attachIterator);
ZEND_METHOD(MultipleIterator, detachIterator);
ZEND_METHOD(MultipleIterator, containsIterator);
ZEND_METHOD(MultipleIterator, countIterators);
ZEND_METHOD(MultipleIterator, rewind);
ZEND_METHOD(MultipleIterator, valid);
ZEND_METHOD(MultipleIterator, key);
@ -202,7 +203,7 @@ static const zend_function_entry class_MultipleIterator_methods[] = {
ZEND_ME(MultipleIterator, attachIterator, arginfo_class_MultipleIterator_attachIterator, ZEND_ACC_PUBLIC)
ZEND_ME(MultipleIterator, detachIterator, arginfo_class_MultipleIterator_detachIterator, ZEND_ACC_PUBLIC)
ZEND_ME(MultipleIterator, containsIterator, arginfo_class_MultipleIterator_containsIterator, ZEND_ACC_PUBLIC)
ZEND_MALIAS(SplObjectStorage, countIterators, count, arginfo_class_MultipleIterator_countIterators, ZEND_ACC_PUBLIC)
ZEND_ME(MultipleIterator, countIterators, arginfo_class_MultipleIterator_countIterators, ZEND_ACC_PUBLIC)
ZEND_ME(MultipleIterator, rewind, arginfo_class_MultipleIterator_rewind, ZEND_ACC_PUBLIC)
ZEND_ME(MultipleIterator, valid, arginfo_class_MultipleIterator_valid, ZEND_ACC_PUBLIC)
ZEND_ME(MultipleIterator, key, arginfo_class_MultipleIterator_key, ZEND_ACC_PUBLIC)