summaryrefslogtreecommitdiff
path: root/ext/spl/spl_fixedarray.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2019-02-20 02:33:11 +0300
committerDmitry Stogov <dmitry@zend.com>2019-02-20 02:33:11 +0300
commit832d683334064fb635de103dc0d600b63fa47dff (patch)
treef4bfb3c99a3753f428a1eb8969cab7584e5ccb31 /ext/spl/spl_fixedarray.c
parent05e7c8c9fcaf862b48d65a3956dc4f3e4fde129d (diff)
parentf2e515e9eb78b09ecaed057241e7a43bf2d9f883 (diff)
downloadphp-git-832d683334064fb635de103dc0d600b63fa47dff.tar.gz
Merge branch 'PHP-7.4'
* PHP-7.4: Use ZEND_ACC_REUSE_GET_ITERATOR flag instead of run-time class modification
Diffstat (limited to 'ext/spl/spl_fixedarray.c')
-rw-r--r--ext/spl/spl_fixedarray.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/spl/spl_fixedarray.c b/ext/spl/spl_fixedarray.c
index 0399c3ce37..1236593479 100644
--- a/ext/spl/spl_fixedarray.c
+++ b/ext/spl/spl_fixedarray.c
@@ -227,7 +227,6 @@ static zend_object *spl_fixedarray_object_new_ex(zend_class_entry *class_type, z
while (parent) {
if (parent == spl_ce_SplFixedArray) {
intern->std.handlers = &spl_handler_SplFixedArray;
- class_type->get_iterator = spl_fixedarray_get_iterator;
break;
}
@@ -1083,6 +1082,7 @@ PHP_MINIT_FUNCTION(spl_fixedarray)
REGISTER_SPL_IMPLEMENTS(SplFixedArray, Countable);
spl_ce_SplFixedArray->get_iterator = spl_fixedarray_get_iterator;
+ spl_ce_SplFixedArray->ce_flags |= ZEND_ACC_REUSE_GET_ITERATOR;
return SUCCESS;
}