diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-02-18 13:58:40 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-02-18 13:58:40 +0100 |
| commit | e517cffd928477bf6cbd6700e24703830a58b75f (patch) | |
| tree | 9d8574147ffce109ca257d57ac7b553abab54b47 /Zend/zend_interfaces.c | |
| parent | 1bf40df18188014026705cc53dd29681b5891692 (diff) | |
| parent | c9ffae1bec67d628d2859368be66175b5c693de5 (diff) | |
| download | php-git-e517cffd928477bf6cbd6700e24703830a58b75f.tar.gz | |
Merge branch 'PHP-7.4'
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 e2138e0ce3..4c9bb28310 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) { |