[pull] master from php:master

NEWS

@@ -2,6 +2,10 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 8.5.0beta3
 
+- Core:
+  . Destructing non-array values (other than NULL) using [] or list() now
+    emits a warning. (Girgias)
+
 - Opcache:
   . Fixed bug GH-19486 (Incorrect opline after deoptimization). (Arnaud)
 

UPGRADING

@@ -52,6 +52,9 @@ PHP 8.5 UPGRADE NOTES
   . The disable_classes INI setting has been removed as it causes various
     engine assumptions to be broken.
     RFC: https://wiki.php.net/rfc/deprecations_php_8_5#remove_disable_classes_ini_setting
+  . Destructing non-array values (other than NULL) using [] or list() now
+    emits a warning.
+    RFC: https://wiki.php.net/rfc/warnings-php-8-5#destructuring_non-array_values
 
 - BZ2:
   . bzcompress() now throws a ValueError when $block_size is not between

Zend/tests/foreach/foreach_list_002.phpt

@@ -7,16 +7,48 @@ foreach (array(array(1,2), array(3,4)) as list($a, )) {
     var_dump($a);
 }
 
+echo "Array of strings:\n";
 $array = [['a', 'b'], 'c', 'd'];
 
 foreach($array as list(, $a)) {
    var_dump($a);
 }
 
+echo "Array of ints:\n";
+$array = [[5, 6], 10, 20];
+
+foreach($array as list(, $a)) {
+   var_dump($a);
+}
+
+echo "Array of nulls:\n";
+$array = [[null, null], null, null];
+
+foreach($array as list(, $a)) {
+   var_dump($a);
+}
+
 ?>
---EXPECT--
+--EXPECTF--
 int(1)
 int(3)
+Array of strings:
 string(1) "b"
+
+Warning: Cannot use string as array in %s on line %d
+NULL
+
+Warning: Cannot use string as array in %s on line %d
+NULL
+Array of ints:
+int(6)
+
+Warning: Cannot use int as array in %s on line %d
+NULL
+
+Warning: Cannot use int as array in %s on line %d
+NULL
+Array of nulls:
+NULL
 NULL
 NULL

Zend/tests/list/bug39304.phpt

@@ -8,5 +8,9 @@ Bug #39304 (Segmentation fault with list unpacking of string offset)
 ?>
 --EXPECTF--
 Warning: Uninitialized string offset 0 in %s on line %d
+
+Warning: Cannot use string as array in %s on line %d
+
+Warning: Cannot use string as array in %s on line %d
 NULL
 NULL

Zend/tests/list/destruct_bool.phpt

@@ -0,0 +1,18 @@
+--TEST--
+Destructuring with list() a value of type bool
+--FILE--
+<?php
+
+$v = true;
+
+list($a, $b) = $v;
+
+var_dump($a, $b);
+
+?>
+--EXPECTF--
+Warning: Cannot use bool as array in %s on line %d
+
+Warning: Cannot use bool as array in %s on line %d
+NULL
+NULL

Zend/tests/list/destruct_float.phpt

@@ -0,0 +1,18 @@
+--TEST--
+Destructuring with list() a value of type float
+--FILE--
+<?php
+
+$v = 25.64;
+
+list($a, $b) = $v;
+
+var_dump($a, $b);
+
+?>
+--EXPECTF--
+Warning: Cannot use float as array in %s on line %d
+
+Warning: Cannot use float as array in %s on line %d
+NULL
+NULL

Zend/tests/list/destruct_int.phpt

@@ -0,0 +1,18 @@
+--TEST--
+Destructuring with list() a value of type int
+--FILE--
+<?php
+
+$v = 5;
+
+list($a, $b) = $v;
+
+var_dump($a, $b);
+
+?>
+--EXPECTF--
+Warning: Cannot use int as array in %s on line %d
+
+Warning: Cannot use int as array in %s on line %d
+NULL
+NULL

Zend/tests/list/destruct_null.phpt

@@ -0,0 +1,12 @@
+--TEST--
+Destructuring with list() a value of type null
+--FILE--
+<?php
+
+list($a) = null;
+
+var_dump($a);
+
+?>
+--EXPECT--
+NULL

Zend/tests/list/destruct_object_not_ArrayAccess.phpt

@@ -0,0 +1,17 @@
+--TEST--
+Destructuring with list() a value of type object (that does not implement ArrayAccess)
+--FILE--
+<?php
+
+$v = new stdClass();
+
+list($a, $b) = $v;
+
+var_dump($a, $b);
+
+?>
+--EXPECTF--
+Fatal error: Uncaught Error: Cannot use object of type stdClass as array in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d

Zend/tests/list/destruct_resource.phpt

@@ -0,0 +1,18 @@
+--TEST--
+Destructuring with list() a value of type resource
+--FILE--
+<?php
+
+$v = STDERR;
+
+list($a, $b) = $v;
+
+var_dump($a, $b);
+
+?>
+--EXPECTF--
+Warning: Cannot use resource as array in %s on line %d
+
+Warning: Cannot use resource as array in %s on line %d
+NULL
+NULL

Zend/tests/list/destruct_string.phpt

@@ -0,0 +1,21 @@
+--TEST--
+Destructuring with list() a value of type string
+--FILE--
+<?php
+
+$v = 'hi';
+
+list($a, $b, $c) = $v;
+
+var_dump($a, $b, $c);
+
+?>
+--EXPECTF--
+Warning: Cannot use string as array in %s on line %d
+
+Warning: Cannot use string as array in %s on line %d
+
+Warning: Cannot use string as array in %s on line %d
+NULL
+NULL
+NULL

Zend/zend_execute.c

@@ -3005,7 +3005,7 @@ static zend_never_inline void ZEND_FASTCALL zend_fetch_dimension_address_UNSET(z
 	zend_fetch_dimension_address(result, container_ptr, dim, dim_type, BP_VAR_UNSET EXECUTE_DATA_CC);
 }
 
-static zend_always_inline void zend_fetch_dimension_address_read(zval *result, zval *container, zval *dim, int dim_type, int type, bool is_list, int slow EXECUTE_DATA_DC)
+static zend_always_inline void zend_fetch_dimension_address_read(zval *result, zval *container, zval *dim, int dim_type, int type, bool is_list, bool slow EXECUTE_DATA_DC)
 {
 	zval *retval;
 
@@ -3143,6 +3143,9 @@ static zend_always_inline void zend_fetch_dimension_address_read(zval *result, z
 		if (ZEND_CONST_COND(dim_type == IS_CV, 1) && UNEXPECTED(Z_TYPE_P(dim) == IS_UNDEF)) {
 			ZVAL_UNDEFINED_OP2();
 		}
+		if (is_list && Z_TYPE_P(container) > IS_NULL) {
+			zend_error(E_WARNING, "Cannot use %s as array", zend_zval_type_name(container));
+		}
 		if (!is_list && type != BP_VAR_IS) {
 			zend_error(E_WARNING, "Trying to access array offset on %s",
 				zend_zval_value_name(container));

ext/opcache/jit/zend_jit_helpers.c

@@ -16,6 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
+#include "Zend/zend_types.h"
 #include "Zend/zend_API.h"
 
 static ZEND_COLD void undef_result_after_exception(void) {
@@ -2561,6 +2562,14 @@ static void ZEND_FASTCALL zend_jit_only_vars_by_reference(zval *arg)
 	zend_error(E_NOTICE, "Only variables should be passed by reference");
 }
 
+static void ZEND_FASTCALL zend_jit_invalid_array_use(const zval *container)
+{
+	/* Warning should not occur on null */
+	if (Z_TYPE_P(container) != IS_NULL) {
+		zend_error(E_WARNING, "Cannot use %s as array", zend_zval_type_name(container));
+	}
+}
+
 static void ZEND_FASTCALL zend_jit_invalid_array_access(zval *container)
 {
 	zend_error(E_WARNING, "Trying to access array offset on %s", zend_zval_value_name(container));

ext/opcache/jit/zend_jit_ir.c

@@ -16,6 +16,7 @@
  *  +----------------------------------------------------------------------+
  */
 
+#include "Zend/zend_type_info.h"
 #include "jit/ir/ir.h"
 #include "jit/ir/ir_builder.h"
 #include "jit/tls/zend_jit_tls.h"
@@ -12786,7 +12787,7 @@ static int zend_jit_fetch_dim_read(zend_jit_ctx       *jit,
 				}
 			}
 
-			if (opline->opcode != ZEND_FETCH_DIM_IS && opline->opcode != ZEND_FETCH_LIST_R) {
+			if (opline->opcode != ZEND_FETCH_DIM_IS) {
 				ir_ref ref;
 
 				may_throw = 1;
@@ -12796,7 +12797,11 @@ static int zend_jit_fetch_dim_read(zend_jit_ctx       *jit,
 					jit_SET_EX_OPLINE(jit, opline);
 					ref = jit_ZVAL_ADDR(jit, op1_addr);
 				}
-				ir_CALL_1(IR_VOID, ir_CONST_FC_FUNC(zend_jit_invalid_array_access), ref);
+				if (opline->opcode == ZEND_FETCH_LIST_R) {
+					ir_CALL_1(IR_VOID, ir_CONST_FC_FUNC(zend_jit_invalid_array_use), ref);
+				} else {
+					ir_CALL_1(IR_VOID, ir_CONST_FC_FUNC(zend_jit_invalid_array_access), ref);
+				}
 			}
 
 			jit_set_Z_TYPE_INFO(jit, res_addr, IS_NULL);

ext/opcache/tests/jit/fetch_list_r_001.phpt

@@ -13,5 +13,6 @@ function test() {
 }
 test();
 ?>
---EXPECT--
+--EXPECTF--
+Warning: Cannot use string as array in %s on line %d
 NULL