diff options
| author | Joe Watkins <krakjoe@php.net> | 2016-03-28 11:55:03 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2016-03-28 11:55:03 +0100 |
| commit | 34d8fea1a810e48e7cc93ae22b6119525298a37a (patch) | |
| tree | 02058c40c90e8c454935f69b171a937661f5e606 /Zend/zend_inheritance.c | |
| parent | a3f0add913eae382e639bb1eb7e6bead4d3ea00e (diff) | |
| parent | ee9a78a033696ff9546fb1dbfecd28f20477b511 (diff) | |
| download | php-git-34d8fea1a810e48e7cc93ae22b6119525298a37a.tar.gz | |
Merge branch 'PHP-7.0'
* PHP-7.0:
work on #71428
Diffstat (limited to 'Zend/zend_inheritance.c')
| -rw-r--r-- | Zend/zend_inheritance.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c index e3ef6a6991..ca9757eced 100644 --- a/Zend/zend_inheritance.c +++ b/Zend/zend_inheritance.c @@ -238,6 +238,11 @@ static int zend_do_perform_type_hint_check(const zend_function *fe, zend_arg_inf zend_string_release(fe_class_name); } + if (proto_arg_info->allow_null && !fe_arg_info->allow_null) { + /* incompatible nullability */ + return 0; + } + if (fe_arg_info->type_hint != proto_arg_info->type_hint) { /* Incompatible type */ return 0; |