diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-02-18 13:46:24 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-02-18 13:47:44 +0100 |
| commit | c9ffae1bec67d628d2859368be66175b5c693de5 (patch) | |
| tree | 356ba5bc4e6eb13565effdda62d496c997edab6e /Zend/zend_interfaces.c | |
| parent | 7d0d94e230b431e06937855e793ba5ffcfdad55e (diff) | |
| download | php-git-c9ffae1bec67d628d2859368be66175b5c693de5.tar.gz | |
Fixed bug #77633
Add a new class flag to inherit get_iterator() when implementing
the Iterator/IteratorAggregate interfaces and use it for
ArrayIterator.
Diffstat (limited to 'Zend/zend_interfaces.c')
| -rw-r--r-- | Zend/zend_interfaces.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/Zend/zend_interfaces.c b/Zend/zend_interfaces.c index e5b6251d17..fe4c9ed9a3 100644 --- a/Zend/zend_interfaces.c +++ b/Zend/zend_interfaces.c @@ -340,7 +340,13 @@ static int zend_implement_aggregate(zend_class_entry *interface, zend_class_entr } } } - class_type->get_iterator = zend_user_it_get_new_iterator; + if (class_type->parent + && (class_type->parent->ce_flags & ZEND_ACC_REUSE_GET_ITERATOR)) { + class_type->get_iterator = class_type->parent->get_iterator; + class_type->ce_flags |= ZEND_ACC_REUSE_GET_ITERATOR; + } else { + class_type->get_iterator = zend_user_it_get_new_iterator; + } funcs_ptr = class_type->iterator_funcs_ptr; if (class_type->type == ZEND_INTERNAL_CLASS) { if (!funcs_ptr) { @@ -381,7 +387,13 @@ static int zend_implement_iterator(zend_class_entry *interface, zend_class_entry return FAILURE; } } - class_type->get_iterator = zend_user_it_get_iterator; + if (class_type->parent + && (class_type->parent->ce_flags & ZEND_ACC_REUSE_GET_ITERATOR)) { + class_type->get_iterator = class_type->parent->get_iterator; + class_type->ce_flags |= ZEND_ACC_REUSE_GET_ITERATOR; + } else { + class_type->get_iterator = zend_user_it_get_iterator; + } funcs_ptr = class_type->iterator_funcs_ptr; if (class_type->type == ZEND_INTERNAL_CLASS) { if (!funcs_ptr) { |