diff options
| author | Andrea Faulds <ajf@ajf.me> | 2016-08-08 21:00:49 +0100 |
|---|---|---|
| committer | Andrea Faulds <ajf@ajf.me> | 2016-08-08 21:00:49 +0100 |
| commit | ab45f13a0b9bebfbc6bfeb7aa9303cd8c62cda69 (patch) | |
| tree | 20065240e769caf592a65342f4ff17266d578159 | |
| parent | e8d8169fc1d2f5d6a65b9ab29af176c8c8fa2c12 (diff) | |
| parent | 5358c7cf5eda4a4c72e232e22c2f8179f0e8007d (diff) | |
| download | php-git-ab45f13a0b9bebfbc6bfeb7aa9303cd8c62cda69.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
| -rw-r--r-- | Zend/zend_execute.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index a8cb618b74..234f62a592 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -836,11 +836,8 @@ static zend_always_inline int zend_verify_arg_type(zend_function *zf, uint32_t a } else { ce = zend_verify_arg_class_kind(cur_arg_info); if (UNEXPECTED(!ce)) { - if (Z_TYPE_P(arg) == IS_OBJECT) { - zend_verify_arg_error(zf, arg_num, "be an instance of ", ZSTR_VAL(cur_arg_info->class_name), "instance of ", ZSTR_VAL(Z_OBJCE_P(arg)->name)); - } else { - zend_verify_arg_error(zf, arg_num, "be an instance of ", ZSTR_VAL(cur_arg_info->class_name), "", zend_zval_type_name(arg)); - } + ZEND_ASSERT(Z_TYPE_P(arg) != IS_OBJECT); + zend_verify_arg_error(zf, arg_num, "be an instance of ", ZSTR_VAL(cur_arg_info->class_name), "", zend_zval_type_name(arg)); return 0; } *cache_slot = (void*)ce; |