diff --git a/NEWS b/NEWS index b8a0d86003a93..6208e65640f03 100644 --- a/NEWS +++ b/NEWS @@ -9,6 +9,7 @@ PHP NEWS . Fixed bug #62814 (It is possible to stiffen child class members visibility). (Nikita) . Fixed bug #69989 (Generators don't participate in cycle GC). (Nikita) + . Fixed bug #71428 (Inheritance and allow_null). (Joe) . Fixed bug #71572 (String offset assignment from an empty string inserts null byte). (Francois) . Implemented the RFC `Support Class Constant Visibility`. (Sean DuBois, diff --git a/Zend/tests/bug71428.1.phpt b/Zend/tests/bug71428.1.phpt index fbf342380ffed..b754687560a62 100644 --- a/Zend/tests/bug71428.1.phpt +++ b/Zend/tests/bug71428.1.phpt @@ -1,7 +1,5 @@ --TEST-- bug #71428.1: inheritance with null default values ---XFAIL-- -This is a BC break --FILE-- ---EXPECT-- -OK +--EXPECTF-- +Fatal error: Declaration of Hello::bar(array $baz = Array) must be compatible with Foo::bar(array $baz = NULL) in %s on line %d diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c index 42283f94dca2b..f376150f404c3 100644 --- a/Zend/zend_inheritance.c +++ b/Zend/zend_inheritance.c @@ -319,13 +319,10 @@ static zend_bool zend_do_perform_implementation_check(const zend_function *fe, c return 0; } -#if 0 - // This introduces BC break described at https://bugs.php.net/bug.php?id=72119 if (proto_arg_info->type_hint && proto_arg_info->allow_null && !fe_arg_info->allow_null) { /* incompatible nullability */ return 0; } -#endif /* by-ref constraints on arguments are invariant */ if (fe_arg_info->pass_by_reference != proto_arg_info->pass_by_reference) {