Merge branch 'PHP-8.0' into PHP-8.1

* PHP-8.0:
  Private method incorrectly marked as "overwrites" in reflection
This commit is contained in:
Ilija Tovilo 2022-09-08 10:44:13 +02:00
commit a795f3ebc6
No known key found for this signature in database
GPG key ID: A4F5D403F118200A
3 changed files with 27 additions and 3 deletions

View file

@ -793,7 +793,7 @@ static void _function_string(smart_str *str, zend_function *fptr, zend_class_ent
} else if (fptr->common.scope->parent) {
lc_name = zend_string_tolower(fptr->common.function_name);
if ((overwrites = zend_hash_find_ptr(&fptr->common.scope->parent->function_table, lc_name)) != NULL) {
if (fptr->common.scope != overwrites->common.scope) {
if (fptr->common.scope != overwrites->common.scope && !(overwrites->common.fn_flags & ZEND_ACC_PRIVATE)) {
smart_str_append_printf(str, ", overwrites %s", ZSTR_VAL(overwrites->common.scope->name));
}
}