diff options
Diffstat (limited to 'Zend/zend_constants.c')
| -rw-r--r-- | Zend/zend_constants.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Zend/zend_constants.c b/Zend/zend_constants.c index 958bd36d1d..fe37e3fbd0 100644 --- a/Zend/zend_constants.c +++ b/Zend/zend_constants.c @@ -353,16 +353,16 @@ ZEND_API zval *zend_get_constant_ex(zend_string *cname, zend_class_entry *scope, if (zend_string_equals_literal_ci(class_name, "self")) { if (UNEXPECTED(!scope)) { - zend_throw_error(NULL, "Cannot access self:: when no class scope is active"); + zend_throw_error(NULL, "Cannot access \"self\" when no class scope is active"); goto failure; } ce = scope; } else if (zend_string_equals_literal_ci(class_name, "parent")) { if (UNEXPECTED(!scope)) { - zend_throw_error(NULL, "Cannot access parent:: when no class scope is active"); + zend_throw_error(NULL, "Cannot access \"parent\" when no class scope is active"); goto failure; } else if (UNEXPECTED(!scope->parent)) { - zend_throw_error(NULL, "Cannot access parent:: when current class scope has no parent"); + zend_throw_error(NULL, "Cannot access \"parent\" when current class scope has no parent"); goto failure; } else { ce = scope->parent; @@ -370,7 +370,7 @@ ZEND_API zval *zend_get_constant_ex(zend_string *cname, zend_class_entry *scope, } else if (zend_string_equals_literal_ci(class_name, "static")) { ce = zend_get_called_scope(EG(current_execute_data)); if (UNEXPECTED(!ce)) { - zend_throw_error(NULL, "Cannot access static:: when no class scope is active"); + zend_throw_error(NULL, "Cannot access \"static\" when no class scope is active"); goto failure; } } else { @@ -380,14 +380,14 @@ ZEND_API zval *zend_get_constant_ex(zend_string *cname, zend_class_entry *scope, c = zend_hash_find_ptr(&ce->constants_table, constant_name); if (c == NULL) { if ((flags & ZEND_FETCH_CLASS_SILENT) == 0) { - zend_throw_error(NULL, "Undefined class constant '%s::%s'", ZSTR_VAL(class_name), ZSTR_VAL(constant_name)); + zend_throw_error(NULL, "Undefined constant %s::%s", ZSTR_VAL(class_name), ZSTR_VAL(constant_name)); goto failure; } ret_constant = NULL; } else { if (!zend_verify_const_access(c, scope)) { if ((flags & ZEND_FETCH_CLASS_SILENT) == 0) { - zend_throw_error(NULL, "Cannot access %s const %s::%s", zend_visibility_string(Z_ACCESS_FLAGS(c->value)), ZSTR_VAL(class_name), ZSTR_VAL(constant_name)); + zend_throw_error(NULL, "Cannot access %s constant %s::%s", zend_visibility_string(Z_ACCESS_FLAGS(c->value)), ZSTR_VAL(class_name), ZSTR_VAL(constant_name)); } goto failure; } @@ -399,7 +399,7 @@ ZEND_API zval *zend_get_constant_ex(zend_string *cname, zend_class_entry *scope, int ret; if (IS_CONSTANT_VISITED(ret_constant)) { - zend_throw_error(NULL, "Cannot declare self-referencing constant '%s::%s'", ZSTR_VAL(class_name), ZSTR_VAL(constant_name)); + zend_throw_error(NULL, "Cannot declare self-referencing constant %s::%s", ZSTR_VAL(class_name), ZSTR_VAL(constant_name)); ret_constant = NULL; goto failure; } @@ -456,7 +456,7 @@ failure: if (!c) { if (!(flags & ZEND_FETCH_CLASS_SILENT)) { - zend_throw_error(NULL, "Undefined constant '%s'", name); + zend_throw_error(NULL, "Undefined constant \"%s\"", name); } return NULL; } |