diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-06-25 11:32:03 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-06-25 11:32:03 +0300 |
| commit | ca22c456ca0b6a199dd767d10d1b10d512c3905c (patch) | |
| tree | ad8701d69df0a2f5aac3edaee2dd699395ee04c3 /Zend/zend_inheritance.c | |
| parent | d2a1fe846265a94a7c73d9e3972daf9175041d90 (diff) | |
| parent | 759f4ecd8bb2c87babc3890dbf40c3003ee320e0 (diff) | |
| download | php-git-ca22c456ca0b6a199dd767d10d1b10d512c3905c.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Keep lowercased parent class name as second argument of DECLARE_CLASS to avoid extra work at run-time
Diffstat (limited to 'Zend/zend_inheritance.c')
| -rw-r--r-- | Zend/zend_inheritance.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c index 15bf4d3c56..d9d2ba2142 100644 --- a/Zend/zend_inheritance.c +++ b/Zend/zend_inheritance.c @@ -2286,11 +2286,11 @@ static void report_variance_errors(zend_class_entry *ce) { zend_hash_index_del(all_obligations, num_key); } -ZEND_API void zend_do_link_class(zend_class_entry *ce) /* {{{ */ +ZEND_API void zend_do_link_class(zend_class_entry *ce, zend_string *lc_parent_name) /* {{{ */ { if (ce->parent_name) { zend_class_entry *parent = zend_fetch_class_by_name( - ce->parent_name, NULL, ZEND_FETCH_CLASS_ALLOW_UNLINKED); + ce->parent_name, lc_parent_name, ZEND_FETCH_CLASS_ALLOW_UNLINKED); if (!(parent->ce_flags & ZEND_ACC_LINKED)) { add_dependency_obligation(ce, parent); } |