Zend: Do not check offset type when using string offset as array

Author: Girgias

Zend/tests/bug24773.phpt

@@ -2,11 +2,11 @@
 Bug #24773 (unset() of integers treated as arrays causes a crash)
 --FILE--
 <?php
-    $array = 'test';
-    unset($array["lvl1"]["lvl2"]["b"]);
+$array = 'test';
+unset($array["lvl1"]["lvl2"]["b"]);
 ?>
 --EXPECTF--
-Fatal error: Uncaught Error: Cannot unset string offsets in %s:%d
+Fatal error: Uncaught Error: Cannot use string offset as an array in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d

Zend/tests/bug73792.phpt

@@ -12,9 +12,7 @@ unset($value);
 echo 'done';
 ?>
 --EXPECTF--
-Warning: Illegal string offset "2bbb" in %s on line %d
-
 Fatal error: Uncaught Error: Cannot create references to/from string offsets in %s:%d
 Stack trace:
 #0 {main}
-  thrown in %sbug73792.php on line 4
+  thrown in %s on line %d

Zend/tests/bug76534.phpt

@@ -10,8 +10,7 @@ $x = "foo";
 $y = &$x["2bar"];
 ?>
 --EXPECTF--
-Fatal error: Uncaught Exception: Illegal string offset "2bar" in %s:%d
+Fatal error: Uncaught Error: Cannot create references to/from string offsets in %s:%d
 Stack trace:
-#0 %sbug76534.php(%d): {closure}(2, 'Illegal string ...', '%s', %d)
-#1 {main}
-  thrown in %sbug76534.php on line %d
+#0 {main}
+  thrown in %s on line %d

Zend/tests/offset_assign.phpt

@@ -8,8 +8,6 @@ $x['2x']['y'] += 1;
 echo "Done\n";
 ?>
 --EXPECTF--
-Warning: Illegal string offset "2x" in %s on line %d
-
 Fatal error: Uncaught Error: Cannot use string offset as an array in %soffset_assign.php:%d
 Stack trace:
 #0 {main}

Zend/zend_execute.c

@@ -2322,7 +2322,6 @@ static ZEND_COLD void zend_binary_assign_op_dim_slow(zval *container, zval *dim
 		if (opline->op2_type == IS_UNUSED) {
 			zend_use_new_element_for_string();
 		} else {
-			zend_check_string_offset(dim, BP_VAR_RW EXECUTE_DATA_CC);
 			zend_wrong_string_offset_error();
 		}
 	} else {
@@ -2624,7 +2623,6 @@ static zend_always_inline void zend_fetch_dimension_address(zval *result, zval *
 		if (dim == NULL) {
 			zend_use_new_element_for_string();
 		} else {
-			zend_check_string_offset(dim, type EXECUTE_DATA_CC);
 			zend_wrong_string_offset_error();
 		}
 		ZVAL_UNDEF(result);

ext/opcache/jit/zend_jit_helpers.c

@@ -1411,9 +1411,6 @@ static zend_always_inline void ZEND_FASTCALL zend_jit_fetch_dim_obj_helper(zval
 		if (!dim) {
 			zend_throw_error(NULL, "[] operator not supported for strings");
 		} else {
-			if (UNEXPECTED(Z_TYPE_P(dim) != IS_LONG)) {
-				zend_check_string_offset(dim, BP_VAR_RW);
-			}
 			zend_wrong_string_offset_error();
 		}
 		ZVAL_UNDEF(result);
@@ -1601,9 +1598,6 @@ static void ZEND_FASTCALL zend_jit_assign_dim_op_helper(zval *container, zval *d
 		if (!dim) {
 			zend_throw_error(NULL, "[] operator not supported for strings");
 		} else {
-			if (UNEXPECTED(Z_TYPE_P(dim) != IS_LONG)) {
-				zend_check_string_offset(dim, BP_VAR_RW);
-			}
 			zend_wrong_string_offset_error();
 		}
 	} else if (Z_TYPE_P(container) == IS_FALSE) {