com php-src: Fixed error messages: Zend/zend_object_handler s.c
| From: | Dmitry Stogov | Date: | Mon, 24 Feb 2014 09:19:32 +0000 |
| Subject: | com php-src: Fixed error messages: Zend/zend_object_handler s.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77977@lists.php.net to get a copy of this message | ||
Commit: fd87bde4d64bae9e268d0f5b7f1977ec83af77e9
Author: Dmitry Stogov <dmitry@zend.com> Mon, 24 Feb 2014 13:19:32 +0400
Parents: b6c5e55b5a91e2cff864c0f0afa9e368b5164f25
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fd87bde4d64bae9e268d0f5b7f1977ec83af77e9
Log:
Fixed error messages
Changed paths:
M Zend/zend_object_handlers.c
Diff:
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index 8a461ff..276f47e 100644
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -332,7 +332,7 @@ static zend_always_inline struct _zend_property_info *zend_get_property_info_qui
if (UNEXPECTED(denied_access != 0)) {
/* Information was available, but we were denied access. Error out. */
if (!silent) {
- zend_error_noreturn(E_ERROR, "Cannot access %s property %s::$%s",
zend_visibility_string(property_info->flags), ce->name, Z_STRVAL_P(member));
+ zend_error_noreturn(E_ERROR, "Cannot access %s property %s::$%s",
zend_visibility_string(property_info->flags), ce->name->val, Z_STRVAL_P(member));
}
return NULL;
} else {
@@ -485,7 +485,7 @@ zval *zend_std_read_property(zval *object, zval *member, int type, const zend_li
Z_SET_REFCOUNT_P(rv, 0);
}
if (UNEXPECTED(Z_TYPE_P(rv) != IS_OBJECT)) {
- zend_error(E_NOTICE, "Indirect modification of overloaded property %s::$%s has no
effect", zobj->ce->name, Z_STRVAL_P(member));
+ zend_error(E_NOTICE, "Indirect modification of overloaded property %s::$%s has no
effect", zobj->ce->name->val, Z_STRVAL_P(member));
}
}
} else {
@@ -1202,7 +1202,7 @@ ZEND_API zend_function *zend_std_get_static_method(zend_class_entry *ce,
zend_st
/* right now this function is used for non static method lookup too */
/* Is the function static */
if (UNEXPECTED(!(fbc->common.fn_flags & ZEND_ACC_STATIC))) {
- zend_error_noreturn(E_ERROR, "Cannot call non static method %s::%s() without object",
ZEND_FN_SCOPE_NAME(fbc), fbc->common.function_name);
+ zend_error_noreturn(E_ERROR, "Cannot call non static method %s::%s() without object",
ZEND_FN_SCOPE_NAME(fbc), fbc->common.function_name->val);
}
#endif
if (fbc->op_array.fn_flags & ZEND_ACC_PUBLIC) {
@@ -1258,14 +1258,14 @@ ZEND_API zval *zend_std_get_static_property(zend_class_entry *ce,
zend_string *p
if (UNEXPECTED(!zend_verify_property_access(property_info, ce TSRMLS_CC))) {
if (!silent) {
- zend_error_noreturn(E_ERROR, "Cannot access %s property %s::$%s",
zend_visibility_string(property_info->flags), ce->name, property_name);
+ zend_error_noreturn(E_ERROR, "Cannot access %s property %s::$%s",
zend_visibility_string(property_info->flags), ce->name->val, property_name->val);
}
return NULL;
}
if (UNEXPECTED((property_info->flags & ZEND_ACC_STATIC) == 0)) {
if (!silent) {
- zend_error_noreturn(E_ERROR, "Access to undeclared static property: %s::$%s",
ce->name, property_name);
+ zend_error_noreturn(E_ERROR, "Access to undeclared static property: %s::$%s",
ce->name->val, property_name->val);
}
return NULL;
}