diff options
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/tests/bug72496.phpt | 43 | ||||
| -rw-r--r-- | Zend/zend_inheritance.c | 4 |
2 files changed, 45 insertions, 2 deletions
diff --git a/Zend/tests/bug72496.phpt b/Zend/tests/bug72496.phpt new file mode 100644 index 0000000000..62e55cb561 --- /dev/null +++ b/Zend/tests/bug72496.phpt @@ -0,0 +1,43 @@ +--TEST-- +Bug #72496 (declare public method with signature incompatible with parent private method should not throw a warning) +--FILE-- +<?php +class Foo +{ + private function getFoo() + { + return 'Foo'; + } + + private function getBar() + { + return 'Bar'; + } + + private function getBaz() + { + return 'Baz'; + } +} + +class Bar extends Foo +{ + public function getFoo($extraArgument) + { + return $extraArgument; + } + + protected function getBar($extraArgument) + { + return $extraArgument; + } + + private function getBaz($extraArgument) + { + return $extraArgument; + } +} + +echo "OK\n"; +--EXPECT-- +OK 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; } |