mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-09 12:34:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.4'

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/opcache/tests/preload.inc
View File

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

5
ext/opcache/zend_persist.c
View File

@ -943,8 +943,9 @@ 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);
prop->type = ZEND_TYPE_ENCODE_CE(ce, ZEND_TYPE_ALLOW_NULL(prop->type));
if (ce) {
prop->type = ZEND_TYPE_ENCODE_CE(ce, ZEND_TYPE_ALLOW_NULL(prop->type));
}
}
}
} ZEND_HASH_FOREACH_END();