Merge branch 'PHP-7.4'

This commit is contained in:
Nikita Popov 2019-09-09 11:37:36 +02:00
commit f16ad678f7
2 changed files with 5 additions and 2 deletions

View File

@ -43,6 +43,8 @@ class Z {
public a $bar;
}
class Z2 extends Z {}
function get_anon() {
return new class {};
}

View File

@ -943,10 +943,11 @@ static void zend_update_parent_ce(zend_class_entry *ce)
zend_class_entry *ce = ZEND_TYPE_CE(prop->type);
if (ce->type == ZEND_USER_CLASS) {
ce = zend_shared_alloc_get_xlat_entry(ce);
ZEND_ASSERT(ce);
if (ce) {
prop->type = ZEND_TYPE_ENCODE_CE(ce, ZEND_TYPE_ALLOW_NULL(prop->type));
}
}
}
} ZEND_HASH_FOREACH_END();
}