diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2016-04-28 19:57:59 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2016-04-28 19:57:59 +0300 |
| commit | 389f77b37cb8f40eca95d8c01ccf449151ce7a80 (patch) | |
| tree | 3f44661ddc7aa9059f408151d84ba9c05794cdd8 /Zend/zend_inheritance.c | |
| parent | c07069495be251317a65fb49f914651961996f84 (diff) | |
| parent | 9e45ac53ce64461e56f82f5847526a675c769f88 (diff) | |
| download | php-git-389f77b37cb8f40eca95d8c01ccf449151ce7a80.tar.gz | |
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed BC break described by bug #72119. It was introduced after 7.0.5 release by attempt to fix bug #71428.
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) { |