From: Andi Gutmans <andi@php.net>
Date: Fri, 5 Dec 2003 16:28:54 +0000 (+0000)
Subject: - Remove two unneeded convert_to_string() (found by Marcus)
X-Git-Tag: php-5.0.0b3RC1~285
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f4d6a5c7cf1faa7e8d4b9f0bef3e4599d00ca7fc;p=php

- 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 53f25f4533..1cae6eab5f 100644
--- 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 4671d889d4..bf50c4eaa8 100644
--- 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));