diff options
| author | Julien Pauli <jpauli@php.net> | 2015-12-24 15:19:54 +0100 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2015-12-24 15:19:54 +0100 |
| commit | 7a2f60d3c7a0b80525f5435b3582540e7ae337ee (patch) | |
| tree | 2710e521de03eda45c78fa5a2d7dda683a7441d1 /Zend/zend_inheritance.c | |
| parent | 2a4993d0fb1055afd275da4aefd452dcd3656188 (diff) | |
| parent | 2a7eeff33e6b798c0b36a0a0e52fbf8c3197f4e9 (diff) | |
| download | php-git-7a2f60d3c7a0b80525f5435b3582540e7ae337ee.tar.gz | |
Merge branch 'PHP-7.0'
* PHP-7.0:
Remove mentions of "type hint" and "typehint"
Diffstat (limited to 'Zend/zend_inheritance.c')
| -rw-r--r-- | Zend/zend_inheritance.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c index d9367d82f5..0c929440ac 100644 --- a/Zend/zend_inheritance.c +++ b/Zend/zend_inheritance.c @@ -170,7 +170,7 @@ char *zend_visibility_string(uint32_t fn_flags) /* {{{ */ static int zend_do_perform_type_hint_check(const zend_function *fe, zend_arg_info *fe_arg_info, const zend_function *proto, zend_arg_info *proto_arg_info) /* {{{ */ { if (ZEND_LOG_XOR(fe_arg_info->class_name, proto_arg_info->class_name)) { - /* Only one has a type hint and the other one doesn't */ + /* Only one has a type declaration and the other one doesn't */ return 0; } @@ -239,7 +239,7 @@ static int zend_do_perform_type_hint_check(const zend_function *fe, zend_arg_inf } if (fe_arg_info->type_hint != proto_arg_info->type_hint) { - /* Incompatible type hint */ + /* Incompatible type */ return 0; } |