Skip to content

Commit 32274d8

Browse files
committed
Merge branch 'PHP-7.4'
* PHP-7.4: ws
2 parents d94c27d + c3f2364 commit 32274d8

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

Zend/zend_compile.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2777,7 +2777,7 @@ static void zend_compile_list_assign(
27772777
continue;
27782778
}
27792779
}
2780-
2780+
27812781
if (elem_ast->kind == ZEND_AST_UNPACK) {
27822782
zend_error(E_COMPILE_ERROR,
27832783
"Spread operator is not supported in assignments");
@@ -5890,7 +5890,7 @@ static void find_implicit_binds(closure_info *info, zend_ast *params_ast, zend_a
58905890
zend_ast_list *param_list = zend_ast_get_list(params_ast);
58915891
uint32_t i;
58925892

5893-
zend_hash_init(&info->uses, param_list->children, NULL, NULL, 0);
5893+
zend_hash_init(&info->uses, param_list->children, NULL, NULL, 0);
58945894

58955895
find_implicit_binds_recursively(info, stmt_ast);
58965896

@@ -7245,15 +7245,15 @@ static zend_bool zend_try_ct_eval_array(zval *result, zend_ast *ast) /* {{{ */
72457245
if (elem_ast->kind != ZEND_AST_UNPACK) {
72467246
zend_eval_const_expr(&elem_ast->child[0]);
72477247
zend_eval_const_expr(&elem_ast->child[1]);
7248-
7248+
72497249
if (elem_ast->attr /* by_ref */ || elem_ast->child[0]->kind != ZEND_AST_ZVAL
72507250
|| (elem_ast->child[1] && elem_ast->child[1]->kind != ZEND_AST_ZVAL)
72517251
) {
72527252
is_constant = 0;
72537253
}
72547254
} else {
72557255
zend_eval_const_expr(&elem_ast->child[0]);
7256-
7256+
72577257
if (elem_ast->child[0]->kind != ZEND_AST_ZVAL) {
72587258
is_constant = 0;
72597259
}
@@ -7294,13 +7294,13 @@ static zend_bool zend_try_ct_eval_array(zval *result, zend_ast *ast) /* {{{ */
72947294
}
72957295
Z_TRY_ADDREF_P(val);
72967296
} ZEND_HASH_FOREACH_END();
7297-
7297+
72987298
continue;
72997299
} else {
73007300
zend_error_noreturn(E_COMPILE_ERROR, "Only arrays and Traversables can be unpacked");
73017301
}
7302-
}
7303-
7302+
}
7303+
73047304
Z_TRY_ADDREF_P(value);
73057305

73067306
key_ast = elem_ast->child[1];

0 commit comments

Comments
 (0)