Merge branch 'PHP-7.0' into PHP-7.1

diff --cc Zend/zend_execute.c
index a8cb618b74b0926dc70927f9de4d272de50d3d03,1012b3cc4fc539892b4d70fc203457593408089b..234f62a592a66d517c522eccbb9a8a05b2222054
--- 1/Zend/zend_execute.c
--- 2/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;