Improve test coverage and handle deprecated syntax in const expressions

Author: theodorejb

Zend/zend_compile.c

@@ -8802,6 +8802,10 @@ void zend_eval_const_expr(zend_ast **ast_ptr) /* {{{ */
 				zend_error_noreturn(E_COMPILE_ERROR, "Cannot use [] for reading");
 			}
 
+			if (ast->attr == ZEND_ALTERNATIVE_ARRAY_SYNTAX) {
+				zend_error(E_DEPRECATED, "Array and string offset access syntax with curly braces is deprecated");
+			}
+
 			/* Set isset fetch indicator here, opcache disallows runtime altering of the AST */
 			if (ast->attr == ZEND_DIM_IS && ast->child[0]->kind == ZEND_AST_DIM) {
 				ast->child[0]->attr = ZEND_DIM_IS;

Zend/zend_compile.h

@@ -991,6 +991,9 @@ static zend_always_inline int zend_check_arg_send_type(const zend_function *zf,
 #define ZEND_ARRAY_NOT_PACKED		(1<<1)
 #define ZEND_ARRAY_SIZE_SHIFT		2
 
+/* Array/string access syntax with curly braces is used */
+#define ZEND_ALTERNATIVE_ARRAY_SYNTAX			1
+
 /* Attribute for ternary inside parentheses */
 #define ZEND_PARENTHESIZED_CONDITIONAL 1
 
@@ -1090,7 +1093,4 @@ END_EXTERN_C()
 
 ZEND_API zend_bool zend_binary_op_produces_numeric_string_error(uint32_t opcode, zval *op1, zval *op2);
 
-/* Array/string access syntax with curly braces is used */
-#define ZEND_ALTERNATIVE_ARRAY_SYNTAX			1
-
 #endif /* ZEND_COMPILE_H */

tests/strings/offsets_general.phpt

@@ -1,21 +1,46 @@
 --TEST--
 testing the behavior of string offsets
---INI--
-error_reporting=E_ALL
 --FILE--
 <?php
 $string = "foobar";
+const FOO = "BAR"[0];
+var_dump(FOO);
 var_dump($string[0]);
 var_dump($string[1]);
 var_dump(isset($string[0]));
 var_dump(isset($string[0][0]));
 var_dump($string["foo"]);
 var_dump(isset($string["foo"]["bar"]));
+
+const FOO_DEPRECATED = "BAR"{0};
+var_dump(FOO_DEPRECATED);
 var_dump($string{0});
+var_dump($string{1});
+var_dump(isset($string{0}));
+var_dump(isset($string{0}{0}));
+var_dump($string{"foo"});
+var_dump(isset($string{"foo"}{"bar"}));
 ?>
 --EXPECTF--
 
 Deprecated: Array and string offset access syntax with curly braces is deprecated in %s line %d
+
+Deprecated: Array and string offset access syntax with curly braces is deprecated in %s line %d
+
+Deprecated: Array and string offset access syntax with curly braces is deprecated in %s line %d
+
+Deprecated: Array and string offset access syntax with curly braces is deprecated in %s line %d
+
+Deprecated: Array and string offset access syntax with curly braces is deprecated in %s line %d
+
+Deprecated: Array and string offset access syntax with curly braces is deprecated in %s line %d
+
+Deprecated: Array and string offset access syntax with curly braces is deprecated in %s line %d
+
+Deprecated: Array and string offset access syntax with curly braces is deprecated in %s line %d
+
+Deprecated: Array and string offset access syntax with curly braces is deprecated in %s line %d
+string(1) "B"
 string(1) "f"
 string(1) "o"
 bool(true)
@@ -24,4 +49,12 @@ bool(true)
 Warning: Illegal string offset 'foo' in %s line %d
 string(1) "f"
 bool(false)
+string(1) "B"
+string(1) "f"
+string(1) "o"
+bool(true)
+bool(true)
+
+Warning: Illegal string offset 'foo' in %s line %d
 string(1) "f"
+bool(false)