diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-02-14 13:18:45 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-02-14 13:18:45 +0300 |
| commit | 4474cf43e6ba4faa33e66146bfa2859e1094b32f (patch) | |
| tree | 3307c1abdd2ddd71526fbe5e4ffe2616cfc66e81 /Zend/zend_API.c | |
| parent | ad559556b9f138a17f326cbeabcee76fdc732e2f (diff) | |
| parent | 43a7d95016761787cace63fb52e93e27e123d0cc (diff) | |
| download | php-git-4474cf43e6ba4faa33e66146bfa2859e1094b32f.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #77613 (method visibility change) (reverted ZEND_ACC_CTOR and ZEND_ACC_DTOR flags removal)
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 0b745161ff..c03b6bfa5b 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -2314,11 +2314,13 @@ ZEND_API int zend_register_functions(zend_class_entry *scope, const zend_functio scope->__isset = __isset; scope->__debugInfo = __debugInfo; if (ctor) { + ctor->common.fn_flags |= ZEND_ACC_CTOR; if (ctor->common.fn_flags & ZEND_ACC_STATIC) { zend_error(error_type, "Constructor %s::%s() cannot be static", ZSTR_VAL(scope->name), ZSTR_VAL(ctor->common.function_name)); } } if (dtor) { + dtor->common.fn_flags |= ZEND_ACC_DTOR; if (dtor->common.fn_flags & ZEND_ACC_STATIC) { zend_error(error_type, "Destructor %s::%s() cannot be static", ZSTR_VAL(scope->name), ZSTR_VAL(dtor->common.function_name)); } |