From: Andrea Faulds <ajf@ajf.me>
Date: Mon, 8 Aug 2016 20:00:49 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0beta3~89
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ab45f13a0b9bebfbc6bfeb7aa9303cd8c62cda69;p=php

Merge branch 'PHP-7.0' into PHP-7.1
---

ab45f13a0b9bebfbc6bfeb7aa9303cd8c62cda69
diff --cc Zend/zend_execute.c
index a8cb618b74,1012b3cc4f..234f62a592
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@@ -836,11 -823,8 +836,8 @@@ static zend_always_inline int zend_veri
  				} 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), arg);
++						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;