diff options
| author | Johannes Schlüter <johannes@php.net> | 2006-05-27 17:58:50 +0000 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2006-05-27 17:58:50 +0000 |
| commit | 341ffb3f3d7c1535165375a9fc17ed3906aa23c0 (patch) | |
| tree | 3f5075ce4dd5cae07a81eb0ebea6136a3ce7e637 | |
| parent | ec0c3e853f3cf8488a503b875cfa406ecc94058f (diff) | |
| download | php-git-341ffb3f3d7c1535165375a9fc17ed3906aa23c0.tar.gz | |
- Fix #37614 (Class name lowercased in error message)
| -rw-r--r-- | Zend/zend_compile.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 449ff9bb55..c00a68045d 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -2445,7 +2445,7 @@ ZEND_API zend_class_entry *do_bind_class(zend_op *opline, HashTable *class_table * so we shut up about it. This allows the if (!defined('FOO')) { return; } * approach to work. */ - zend_error(E_COMPILE_ERROR, "Cannot redeclare class %R", Z_TYPE(opline->op2.u.constant), Z_UNIVAL(opline->op2.u.constant)); + zend_error(E_COMPILE_ERROR, "Cannot redeclare class %v", ce->name); } return NULL; } else { @@ -2471,7 +2471,7 @@ ZEND_API zend_class_entry *do_bind_inherited_class(zend_op *opline, HashTable *c * so we shut up about it. This allows the if (!defined('FOO')) { return; } * approach to work. */ - zend_error(E_COMPILE_ERROR, "Cannot redeclare class %R", Z_TYPE(opline->op2.u.constant), Z_UNIVAL(opline->op2.u.constant)); + zend_error(E_COMPILE_ERROR, "Cannot redeclare class %v", ce->name); } return NULL; } else { @@ -2488,7 +2488,7 @@ ZEND_API zend_class_entry *do_bind_inherited_class(zend_op *opline, HashTable *c /* Register the derived class */ if (zend_u_hash_add(class_table, Z_TYPE(opline->op2.u.constant), Z_UNIVAL(opline->op2.u.constant), Z_UNILEN(opline->op2.u.constant)+1, pce, sizeof(zend_class_entry *), NULL)==FAILURE) { - zend_error(E_COMPILE_ERROR, "Cannot redeclare class %R", Z_TYPE(opline->op2.u.constant), Z_UNIVAL(opline->op2.u.constant)); + zend_error(E_COMPILE_ERROR, "Cannot redeclare class %v", ce->name); ce->refcount--; zend_hash_destroy(&ce->function_table); zend_hash_destroy(&ce->default_properties); |