diff options
| author | Joe Watkins <krakjoe@php.net> | 2016-03-29 09:58:06 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2016-03-29 09:58:06 +0100 |
| commit | 45035b1b8d76a3eb9cc9aac0bf78ec879e7f7322 (patch) | |
| tree | 262148f1e7706bbe9a3fef454189938cc19b72ad /Zend/zend_inheritance.c | |
| parent | bdd05e7483830c5c032ff26972fc708315aa78be (diff) | |
| parent | dd70c39556fe6efe2e1f28cecf8fc73d9588d04a (diff) | |
| download | php-git-45035b1b8d76a3eb9cc9aac0bf78ec879e7f7322.tar.gz | |
Merge branch 'PHP-7.0'
* PHP-7.0:
fix bug #71428: Validation type inheritance with = NULL
Diffstat (limited to 'Zend/zend_inheritance.c')
| -rw-r--r-- | Zend/zend_inheritance.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c index 5fd86c974f..bb56b8e56f 100644 --- a/Zend/zend_inheritance.c +++ b/Zend/zend_inheritance.c @@ -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) { |