mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-13 20:05:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.0'

Browse Source 
* PHP-7.0:
  fix bug #71428: Validation type inheritance with = NULL
This commit is contained in:
Joe Watkins 2016-03-29 09:58:06 +01:00
commit 45035b1b8d
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Zend/tests/bug71428.3.phpt Normal file
View File

@ -0,0 +1,11 @@
--TEST--
bug #71428: Validation type inheritance with = NULL
--FILE--
<?php
class A { }
class B { public function m(A $a = NULL, $n) { echo "B.m";} };
class C extends B { public function m(A $a , $n) { echo "C.m";} };
?>
--EXPECTF--
Warning: Declaration of C::m(A $a, $n) should be compatible with B::m(A $a = NULL, $n) in %sbug71428.3.php on line 4

2
Zend/zend_inheritance.c
View File

@ -488,6 +488,8 @@ static ZEND_COLD zend_string *zend_get_function_declaration(const zend_function
} else {
smart_str_appends(&str, "NULL");
}
} else if (arg_info->type_hint && arg_info->allow_null) {
smart_str_appends(&str, " = NULL");
}
if (++i < num_args) {