From: Dmitry Stogov <dmitry@zend.com>
Date: Fri, 21 Feb 2014 16:53:09 +0000 (+0400)
Subject: Fixed error messages
X-Git-Tag: POST_PHPNG_MERGE~412^2~591
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=008a42e7c8799fa7885f805b714c16d8e703b35f;p=php

Fixed error messages
---

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 436fdae1b7..f77aaaae53 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -647,7 +647,7 @@ static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, cons
 				if (ce_base) {
 					if ((!*pce || !instanceof_function(*pce, ce_base TSRMLS_CC))) {
 						zend_spprintf(error, 0, "to be a class name derived from %s, '%s' given",
-							ce_base->name, Z_STRVAL_P(arg));
+							ce_base->name->val, Z_STRVAL_P(arg));
 						*pce = NULL;
 						return "";
 					}
@@ -2768,7 +2768,7 @@ static int zend_is_callable_check_class(zend_string *name, zend_fcall_info_cache
 		*strict_class = 1;
 		ret = 1;
 	} else {
-		if (error) zend_spprintf(error, 0, "class '%.*s' not found", name_len, name);
+		if (error) zend_spprintf(error, 0, "class '%.*s' not found", name_len, name->val);
 	}
 	efree(lcname);
 	return ret;
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index dd27e65656..147461f838 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -815,7 +815,7 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache TS
 
 	if (EX(function_state).function->common.fn_flags & (ZEND_ACC_ABSTRACT|ZEND_ACC_DEPRECATED)) {
 		if (EX(function_state).function->common.fn_flags & ZEND_ACC_ABSTRACT) {
-			zend_error_noreturn(E_ERROR, "Cannot call abstract method %s::%s()", EX(function_state).function->common.scope->name, EX(function_state).function->common.function_name);
+			zend_error_noreturn(E_ERROR, "Cannot call abstract method %s::%s()", EX(function_state).function->common.scope->name->val, EX(function_state).function->common.function_name->val);
 		}
 		if (EX(function_state).function->common.fn_flags & ZEND_ACC_DEPRECATED) {
  			zend_error(E_DEPRECATED, "Function %s%s%s() is deprecated",