Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed bug #77613 (method visibility change) (reverted ZEND_ACC_CTOR and ZEND_ACC_DTOR flags removal)
This commit is contained in:
Dmitry Stogov 2019-02-14 13:18:45 +03:00
commit 4474cf43e6
7 changed files with 38 additions and 9 deletions

View file

@ -1213,7 +1213,7 @@ ZEND_FUNCTION(get_class_methods)
if (!key) {
ZVAL_STR_COPY(&method_name, mptr->common.function_name);
zend_hash_next_index_insert_new(Z_ARRVAL_P(return_value), &method_name);
} else if (mptr->common.scope->constructor != mptr ||
} else if ((mptr->common.fn_flags & ZEND_ACC_CTOR) == 0 ||
mptr->common.scope == ce ||
zend_binary_strcasecmp(ZSTR_VAL(key), ZSTR_LEN(key), ZSTR_VAL(mptr->common.function_name), len) == 0) {