summaryrefslogtreecommitdiff
path: root/Zend/zend_inheritance.c
diff options
context:
space:
mode:
authorLevi Morrison <levim@php.net>2016-05-05 08:58:05 -0600
committerLevi Morrison <levim@php.net>2016-05-05 11:53:32 -0600
commit56c3d75780b7c2faf290722a615fd2d797d2f041 (patch)
tree282e0ea797ab1eec76421b06665b0bf06203edd1 /Zend/zend_inheritance.c
parent9662259cb93ff04be80766bdade39d2e827e0e16 (diff)
downloadphp-git-56c3d75780b7c2faf290722a615fd2d797d2f041.tar.gz
Fix bug #71428
This also affects bug #72119
Diffstat (limited to 'Zend/zend_inheritance.c')
-rw-r--r--Zend/zend_inheritance.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c
index de9b63e342..879e00375c 100644
--- a/Zend/zend_inheritance.c
+++ b/Zend/zend_inheritance.c
@@ -319,13 +319,11 @@ 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) {