Take a regular array as second parameter in ZEND_CLONE OPcode

Author: TimWolla

Zend/zend_compile.c

@@ -5406,42 +5406,7 @@ static void zend_compile_clone(znode *result, zend_ast *ast) /* {{{ */
 
 	znode value_node;
 	if (ast->child[1]) {
-		ZEND_ASSERT(ast->child[1]->kind == ZEND_AST_ARG_LIST);
-		zend_ast_list *args_ast = zend_ast_get_list(ast->child[1]);
-		ZEND_ASSERT(args_ast->children > 0);
-
-		zend_ast *array;
-		zend_ast *last;
-
-		for (uint32_t i = 0; i < args_ast->children; ++i) {
-			zend_ast *arg = args_ast->child[i];
-
-			switch (arg->kind) {
-				case ZEND_AST_UNPACK:
-					if (args_ast->children != 1) {
-						zend_error_noreturn(E_COMPILE_ERROR, "Cannot combine unpacking with other arguments");
-					}
-
-					array = arg->child[0];
-
-					break;
-				case ZEND_AST_NAMED_ARG: {
-					zend_ast *elem = zend_ast_create(ZEND_AST_ARRAY_ELEM, arg->child[1], arg->child[0]);
-					if (i == 0) {
-						array = zend_ast_create_list(args_ast->children, ZEND_AST_ARRAY, elem);
-						last = array;
-					} else {
-						last = zend_ast_list_add(last, elem);
-					}
-					break;
-				}
-				default:
-					zend_error_noreturn(E_COMPILE_ERROR, "Cannot use unnamed argument");
-					break;
-			}
-		}
-
-		zend_compile_expr(&value_node, array);
+		zend_compile_expr(&value_node, ast->child[1]);
 	} else {
 		value_node.op_type = IS_UNUSED;
 	}

Zend/zend_vm_def.h

@@ -6059,7 +6059,7 @@ ZEND_VM_COLD_CONST_HANDLER(110, ZEND_CLONE, CONST|TMPVAR|UNUSED|THIS|CV, ANY)
 		if (OP2_TYPE != IS_UNUSED) {
 			zval *properties = GET_OP2_ZVAL_PTR(BP_VAR_R);
 			if (Z_TYPE_P(properties) != IS_ARRAY) {
-				zend_type_error("Only arrays can be unpacked for clone, %s given", zend_zval_value_name(properties));
+				zend_type_error("Updated properties must be of type array, %s given", zend_zval_value_name(properties));
 				FREE_OP1();
 				FREE_OP2();
 				ZVAL_UNDEF(EX_VAR(opline->result.var));