- Remove two unneeded convert_to_string() (found by Marcus)

- Change illegal use of string offset to E_ERROR

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 53f25f45331ac6fcf8e5cf4bf51238dd875dfc59..1cae6eab5f57b92bc64e1f119fc295d67c63d228 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -2913,7 +2913,7 @@ void zend_do_fetch_static_variable(znode *varname, znode *static_assignment, int
        znode result;
 
        ALLOC_ZVAL(tmp);
-       convert_to_string(&varname->u.constant);
+
        if (static_assignment) {
                *tmp = static_assignment->u.constant;
        } else {
@@ -3227,8 +3227,6 @@ void zend_do_declare_begin(TSRMLS_D)
 
 void zend_do_declare_stmt(znode *var, znode *val TSRMLS_DC)
 {
-       convert_to_string(&var->u.constant);
-
        if (!zend_binary_strcasecmp(var->u.constant.value.str.val, var->u.constant.value.str.len, "ticks", sizeof("ticks")-1)) {
                convert_to_long(&val->u.constant);
                CG(declarables).ticks = val->u.constant;

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 4671d889d478dbcc90b3fb41578ea330c9bb85b8..bf50c4eaa8f582214f3f7d17641a9aac0ca8a304 100644 (file)
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -831,7 +831,7 @@ static void zend_fetch_dimension_address(znode *result, znode *op1, znode *op2,
 
        if (!container_ptr) {
                if (T(op1->u.var).EA.type == IS_STRING_OFFSET) {
-                       zend_error(E_WARNING, "Cannot use string offset as an array");
+                       zend_error(E_ERROR, "Cannot use string offset as an array");
 
                        get_zval_ptr(op2, Ts, &EG(free_op2), BP_VAR_R);
                        FREE_OP(Ts, op2, EG(free_op2));