Restore behavior of $str["str"]. (Now $str["str"] is equivalent to $str[0] again)

1 files changed, 13 insertions, 130 deletions

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 348fd3a6b7..ebb49e13d6 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -9013,16 +9013,7 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_VAR_CONST(int prop_dim,
 		} else if ((*container)->type == IS_STRING && !prop_dim) { /* string offsets */
 			zval tmp;
 
-			if (Z_TYPE_P(offset) == IS_STRING) {
-				char *strval;
-				long  lval;
-
-				strval = Z_STRVAL_P(offset);
-				if (is_numeric_string(strval, Z_STRLEN_P(offset), &lval, NULL, 0) == IS_LONG) {
-					ZVAL_LONG(&tmp, lval);
-					offset = &tmp;
-				}
-			} else if (offset->type != IS_LONG) {
+			if (offset->type != IS_LONG) {
 				tmp = *offset;
 				zval_copy_ctor(&tmp);
 				convert_to_long(&tmp);
@@ -10337,16 +10328,7 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_VAR_TMP(int prop_dim, ZE
 		} else if ((*container)->type == IS_STRING && !prop_dim) { /* string offsets */
 			zval tmp;
 
-			if (Z_TYPE_P(offset) == IS_STRING) {
-				char *strval;
-				long  lval;
-
-				strval = Z_STRVAL_P(offset);
-				if (is_numeric_string(strval, Z_STRLEN_P(offset), &lval, NULL, 0) == IS_LONG) {
-					ZVAL_LONG(&tmp, lval);
-					offset = &tmp;
-				}
-			} else if (offset->type != IS_LONG) {
+			if (offset->type != IS_LONG) {
 				tmp = *offset;
 				zval_copy_ctor(&tmp);
 				convert_to_long(&tmp);
@@ -11682,16 +11664,7 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_VAR_VAR(int prop_dim, ZE
 		} else if ((*container)->type == IS_STRING && !prop_dim) { /* string offsets */
 			zval tmp;
 
-			if (Z_TYPE_P(offset) == IS_STRING) {
-				char *strval;
-				long  lval;
-
-				strval = Z_STRVAL_P(offset);
-				if (is_numeric_string(strval, Z_STRLEN_P(offset), &lval, NULL, 0) == IS_LONG) {
-					ZVAL_LONG(&tmp, lval);
-					offset = &tmp;
-				}
-			} else if (offset->type != IS_LONG) {
+			if (offset->type != IS_LONG) {
 				tmp = *offset;
 				zval_copy_ctor(&tmp);
 				convert_to_long(&tmp);
@@ -13157,16 +13130,7 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_VAR_CV(int prop_dim, ZEN
 		} else if ((*container)->type == IS_STRING && !prop_dim) { /* string offsets */
 			zval tmp;
 
-			if (Z_TYPE_P(offset) == IS_STRING) {
-				char *strval;
-				long  lval;
-
-				strval = Z_STRVAL_P(offset);
-				if (is_numeric_string(strval, Z_STRLEN_P(offset), &lval, NULL, 0) == IS_LONG) {
-					ZVAL_LONG(&tmp, lval);
-					offset = &tmp;
-				}
-			} else if (offset->type != IS_LONG) {
+			if (offset->type != IS_LONG) {
 				tmp = *offset;
 				zval_copy_ctor(&tmp);
 				convert_to_long(&tmp);
@@ -14232,16 +14196,7 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_CONST(int prop_di
 		} else if ((*container)->type == IS_STRING && !prop_dim) { /* string offsets */
 			zval tmp;
 
-			if (Z_TYPE_P(offset) == IS_STRING) {
-				char *strval;
-				long  lval;
-
-				strval = Z_STRVAL_P(offset);
-				if (is_numeric_string(strval, Z_STRLEN_P(offset), &lval, NULL, 0) == IS_LONG) {
-					ZVAL_LONG(&tmp, lval);
-					offset = &tmp;
-				}
-			} else if (offset->type != IS_LONG) {
+			if (offset->type != IS_LONG) {
 				tmp = *offset;
 				zval_copy_ctor(&tmp);
 				convert_to_long(&tmp);
@@ -15190,16 +15145,7 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_TMP(int prop_dim,
 		} else if ((*container)->type == IS_STRING && !prop_dim) { /* string offsets */
 			zval tmp;
 
-			if (Z_TYPE_P(offset) == IS_STRING) {
-				char *strval;
-				long  lval;
-
-				strval = Z_STRVAL_P(offset);
-				if (is_numeric_string(strval, Z_STRLEN_P(offset), &lval, NULL, 0) == IS_LONG) {
-					ZVAL_LONG(&tmp, lval);
-					offset = &tmp;
-				}
-			} else if (offset->type != IS_LONG) {
+			if (offset->type != IS_LONG) {
 				tmp = *offset;
 				zval_copy_ctor(&tmp);
 				convert_to_long(&tmp);
@@ -16148,16 +16094,7 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_VAR(int prop_dim,
 		} else if ((*container)->type == IS_STRING && !prop_dim) { /* string offsets */
 			zval tmp;
 
-			if (Z_TYPE_P(offset) == IS_STRING) {
-				char *strval;
-				long  lval;
-
-				strval = Z_STRVAL_P(offset);
-				if (is_numeric_string(strval, Z_STRLEN_P(offset), &lval, NULL, 0) == IS_LONG) {
-					ZVAL_LONG(&tmp, lval);
-					offset = &tmp;
-				}
-			} else if (offset->type != IS_LONG) {
+			if (offset->type != IS_LONG) {
 				tmp = *offset;
 				zval_copy_ctor(&tmp);
 				convert_to_long(&tmp);
@@ -17225,16 +17162,7 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_CV(int prop_dim,
 		} else if ((*container)->type == IS_STRING && !prop_dim) { /* string offsets */
 			zval tmp;
 
-			if (Z_TYPE_P(offset) == IS_STRING) {
-				char *strval;
-				long  lval;
-
-				strval = Z_STRVAL_P(offset);
-				if (is_numeric_string(strval, Z_STRLEN_P(offset), &lval, NULL, 0) == IS_LONG) {
-					ZVAL_LONG(&tmp, lval);
-					offset = &tmp;
-				}
-			} else if (offset->type != IS_LONG) {
+			if (offset->type != IS_LONG) {
 				tmp = *offset;
 				zval_copy_ctor(&tmp);
 				convert_to_long(&tmp);
@@ -19719,16 +19647,7 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_CONST(int prop_dim, Z
 		} else if ((*container)->type == IS_STRING && !prop_dim) { /* string offsets */
 			zval tmp;
 
-			if (Z_TYPE_P(offset) == IS_STRING) {
-				char *strval;
-				long  lval;
-
-				strval = Z_STRVAL_P(offset);
-				if (is_numeric_string(strval, Z_STRLEN_P(offset), &lval, NULL, 0) == IS_LONG) {
-					ZVAL_LONG(&tmp, lval);
-					offset = &tmp;
-				}
-			} else if (offset->type != IS_LONG) {
+			if (offset->type != IS_LONG) {
 				tmp = *offset;
 				zval_copy_ctor(&tmp);
 				convert_to_long(&tmp);
@@ -21043,16 +20962,7 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_TMP(int prop_dim, ZEN
 		} else if ((*container)->type == IS_STRING && !prop_dim) { /* string offsets */
 			zval tmp;
 
-			if (Z_TYPE_P(offset) == IS_STRING) {
-				char *strval;
-				long  lval;
-
-				strval = Z_STRVAL_P(offset);
-				if (is_numeric_string(strval, Z_STRLEN_P(offset), &lval, NULL, 0) == IS_LONG) {
-					ZVAL_LONG(&tmp, lval);
-					offset = &tmp;
-				}
-			} else if (offset->type != IS_LONG) {
+			if (offset->type != IS_LONG) {
 				tmp = *offset;
 				zval_copy_ctor(&tmp);
 				convert_to_long(&tmp);
@@ -22388,16 +22298,7 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_VAR(int prop_dim, ZEN
 		} else if ((*container)->type == IS_STRING && !prop_dim) { /* string offsets */
 			zval tmp;
 
-			if (Z_TYPE_P(offset) == IS_STRING) {
-				char *strval;
-				long  lval;
-
-				strval = Z_STRVAL_P(offset);
-				if (is_numeric_string(strval, Z_STRLEN_P(offset), &lval, NULL, 0) == IS_LONG) {
-					ZVAL_LONG(&tmp, lval);
-					offset = &tmp;
-				}
-			} else if (offset->type != IS_LONG) {
+			if (offset->type != IS_LONG) {
 				tmp = *offset;
 				zval_copy_ctor(&tmp);
 				convert_to_long(&tmp);
@@ -23863,16 +23764,7 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_CV(int prop_dim, ZEND
 		} else if ((*container)->type == IS_STRING && !prop_dim) { /* string offsets */
 			zval tmp;
 
-			if (Z_TYPE_P(offset) == IS_STRING) {
-				char *strval;
-				long  lval;
-
-				strval = Z_STRVAL_P(offset);
-				if (is_numeric_string(strval, Z_STRLEN_P(offset), &lval, NULL, 0) == IS_LONG) {
-					ZVAL_LONG(&tmp, lval);
-					offset = &tmp;
-				}
-			} else if (offset->type != IS_LONG) {
+			if (offset->type != IS_LONG) {
 				tmp = *offset;
 				zval_copy_ctor(&tmp);
 				convert_to_long(&tmp);
@@ -30938,16 +30830,7 @@ static int zend_isset_isempty_dim_prop_obj_handler(int prop_dim, ZEND_OPCODE_HAN
 		} else if ((*container)->type == IS_STRING && !prop_dim) { /* string offsets */
 			zval tmp;
 
-			if (Z_TYPE_P(offset) == IS_STRING) {
-				char *strval;
-				long  lval;
-
-				strval = Z_STRVAL_P(offset);
-				if (is_numeric_string(strval, Z_STRLEN_P(offset), &lval, NULL, 0) == IS_LONG) {
-					ZVAL_LONG(&tmp, lval);
-					offset = &tmp;
-				}
-			} else if (offset->type != IS_LONG) {
+			if (offset->type != IS_LONG) {
 				tmp = *offset;
 				zval_copy_ctor(&tmp);
 				convert_to_long(&tmp);