diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2016-04-29 11:15:26 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2016-04-29 11:15:26 +0300 |
| commit | 19c0335609ac9a84eaec048ffb7fdcf1312689cd (patch) | |
| tree | b1c28fca2d5272f09c451519b0208404a06ea141 /Zend/zend_inheritance.c | |
| parent | 2f17ef1d25988d8a0a642d262c8dc92d0f205b3c (diff) | |
| download | php-git-19c0335609ac9a84eaec048ffb7fdcf1312689cd.tar.gz | |
Revert "Fix bad merge into master"
This reverts commit 2c8e4ba8f1f63429f5d0e08a4a0fc6d449ca801a.
Diffstat (limited to 'Zend/zend_inheritance.c')
| -rw-r--r-- | Zend/zend_inheritance.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c index f376150f40..42283f94dc 100644 --- a/Zend/zend_inheritance.c +++ b/Zend/zend_inheritance.c @@ -319,10 +319,13 @@ 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) { |