diff options
| author | Pedro Magalhães <mail@pmmaga.net> | 2017-03-10 20:08:15 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2017-05-01 14:15:57 +0200 |
| commit | 5324fb1f348f5bc979d9b5f13ac74177b73f9bf7 (patch) | |
| tree | afc68fd6b62399b4026b8943d0bbb8af8d78cfed /Zend/zend_inheritance.c | |
| parent | 92124f9cdc20c6a9c22f9b54092ef945c41f2bb5 (diff) | |
| download | php-git-5324fb1f348f5bc979d9b5f13ac74177b73f9bf7.tar.gz | |
Fixed bug #61970: Allow a child class to restrict access to ctor
Diffstat (limited to 'Zend/zend_inheritance.c')
| -rw-r--r-- | Zend/zend_inheritance.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c index 675d8c4b75..85c5c5794f 100644 --- a/Zend/zend_inheritance.c +++ b/Zend/zend_inheritance.c @@ -578,8 +578,9 @@ static void do_inheritance_check_on_method(zend_function *child, zend_function * zend_error_noreturn(E_COMPILE_ERROR, "Cannot make non abstract method %s::%s() abstract in class %s", ZEND_FN_SCOPE_NAME(parent), ZSTR_VAL(child->common.function_name), ZEND_FN_SCOPE_NAME(child)); } - /* Prevent derived classes from restricting access that was available in parent classes */ - if (UNEXPECTED((child_flags & ZEND_ACC_PPP_MASK) > (parent_flags & ZEND_ACC_PPP_MASK))) { + /* Prevent derived classes from restricting access that was available in parent classes (except deriving from non-abstract ctors) */ + if (UNEXPECTED((!(child_flags & ZEND_ACC_CTOR) || (parent_flags & (ZEND_ACC_ABSTRACT | ZEND_ACC_IMPLEMENTED_ABSTRACT))) && + (child_flags & ZEND_ACC_PPP_MASK) > (parent_flags & ZEND_ACC_PPP_MASK))) { zend_error_noreturn(E_COMPILE_ERROR, "Access level to %s::%s() must be %s (as in class %s)%s", ZEND_FN_SCOPE_NAME(child), ZSTR_VAL(child->common.function_name), zend_visibility_string(parent_flags), ZEND_FN_SCOPE_NAME(parent), (parent_flags&ZEND_ACC_PUBLIC) ? "" : " or weaker"); } |