Throw Error in AST

Author: Girgias

Zend/tests/array_literal_next_element_error.phpt

@@ -11,15 +11,15 @@ try {
     echo $e->getMessage() . "\n";
 }
 
-try {
-    const FOO = [PHP_INT_MAX => 42, "foo"];
-    var_dump(FOO);
-} catch (\Error $e) {
-    echo $e->getMessage() . "\n";
-}
+const FOO = [PHP_INT_MAX => 42, "foo"];
+var_dump(FOO);
 
 ?>
---EXPECT--
-Cannot add element to the array as the next element is already occupied
+--EXPECTF--
 Cannot add element to the array as the next element is already occupied
 
+Fatal error: Uncaught Error: Cannot add element to the array as the next element is already occupied in %s:11
+Stack trace:
+#0 {main}
+  thrown in %s on line 11
+

Zend/tests/array_unpack/already_occupied.phpt

@@ -6,31 +6,26 @@ Appending to an array via unpack may fail
 <?php
 
 $arr = [1, 2, 3];
-var_dump([PHP_INT_MAX-1 => 0, ...$arr]);
+try {
+    var_dump([PHP_INT_MAX-1 => 0, ...$arr]);
+} catch (\Error $e) {
+    echo $e->getMessage() . "\n";
+}
 
-var_dump([PHP_INT_MAX-1 => 0, ...[1, 2, 3]]);
+try {
+    var_dump([PHP_INT_MAX-1 => 0, ...[1, 2, 3]]);
+} catch (\Error $e) {
+    echo $e->getMessage() . "\n";
+}
 
 const ARR = [1, 2, 3];
 const ARR2 = [PHP_INT_MAX-1 => 0, ...ARR];
 var_dump(ARR2);
 
 ?>
 --EXPECTF--
-Warning: Cannot add element to the array as the next element is already occupied in %s on line %d
-array(2) {
-  [9223372036854775806]=>
-  int(0)
-  [9223372036854775807]=>
-  int(1)
-}
-
-Warning: Cannot add element to the array as the next element is already occupied in %s on line %d
-array(2) {
-  [9223372036854775806]=>
-  int(0)
-  [9223372036854775807]=>
-  int(1)
-}
+Cannot add element to the array as the next element is already occupied
+Cannot add element to the array as the next element is already occupied
 
 Warning: Cannot add element to the array as the next element is already occupied in %s on line %d
 array(2) {

Zend/tests/assign_dim_obj_null_return.phpt

@@ -7,7 +7,11 @@ function test() {
     $array = [PHP_INT_MAX => 42];
     $true = true;
 
-    var_dump($array[] = 123);
+    try {
+        var_dump($array[] = 123);
+    } catch (\Error $e) {
+        echo $e->getMessage() . "\n";
+    }
     var_dump($array[[]] = 123);
     var_dump($array[new stdClass] = 123);
     var_dump($true[123] = 456);
@@ -29,8 +33,7 @@ test();
 
 ?>
 --EXPECTF--
-Warning: Cannot add element to the array as the next element is already occupied in %s on line %d
-NULL
+Cannot add element to the array as the next element is already occupied
 
 Warning: Illegal offset type in %s on line %d
 NULL

Zend/tests/bug69017.phpt

@@ -16,14 +16,19 @@ class c1
 
 c1::$a1[] = 1;
 c1::$a2[] = 1;
-c1::$a3[] = 1;
+
+try {
+    c1::$a3[] = 1;
+} catch (\Error $e) {
+    echo $e->getMessage() . "\n";
+}
 
 var_dump(c1::$a1);
 var_dump(c1::$a2);
 var_dump(c1::$a3);
 ?>
 --EXPECTF--
-Warning: Cannot add element to the array as the next element is already occupied in %sbug69017.php on line %d
+Cannot add element to the array as the next element is already occupied
 array(2) {
   [1]=>
   string(3) "one"

Zend/zend_ast.c

@@ -411,8 +411,7 @@ static int zend_ast_add_array_element(zval *result, zval *offset, zval *expr)
 	switch (Z_TYPE_P(offset)) {
 		case IS_UNDEF:
 			if (!zend_hash_next_index_insert(Z_ARRVAL_P(result), expr)) {
-				zend_error(E_WARNING,
-					"Cannot add element to the array as the next element is already occupied");
+				zend_throw_error(NULL, "Cannot add element to the array as the next element is already occupied");
 				zval_ptr_dtor_nogc(expr);
 			}
 			break;