diff options
| author | Nikita Popov <nikic@php.net> | 2016-07-05 14:31:32 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-07-05 14:32:38 +0200 |
| commit | 8a555d7c66199c629cd4948d486ee45a8d6d412d (patch) | |
| tree | ff6485fd2dd8d6cf9b21ca9dabeda9cd4046b3f5 /Zend/zend_inheritance.c | |
| parent | adf0920065fc8d4eb5b81a4aa7c92e188eeebdb6 (diff) | |
| parent | 08777e9615868cf2acf4dc2a86a7ef21106beddd (diff) | |
| download | php-git-8a555d7c66199c629cd4948d486ee45a8d6d412d.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
Zend/zend_compile.c
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 845500c041..85aadcb29e 100644 --- a/Zend/zend_inheritance.c +++ b/Zend/zend_inheritance.c @@ -268,8 +268,8 @@ static zend_bool zend_do_perform_implementation_check(const zend_function *fe, c return 1; } - /* If both methods are private do not enforce a signature */ - if ((fe->common.fn_flags & ZEND_ACC_PRIVATE) && (proto->common.fn_flags & ZEND_ACC_PRIVATE)) { + /* If the prototype method is private do not enforce a signature */ + if (proto->common.fn_flags & ZEND_ACC_PRIVATE) { return 1; } |