archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.0'

Browse source 
* PHP-7.0:
  work on #71428
This commit is contained in:
Joe Watkins 2016-03-28 11:55:03 +01:00
commit 34d8fea1a8
2 changed files with 18 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Zend/zend_inheritance.c
View file

@ -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;