Add blocks to ?? and ??=

Author: iluuu1994

Zend/tests/block_expr/coalesce.phpt

@@ -0,0 +1,21 @@
+--TEST--
+Coalesce block
+--FILE--
+<?php
+$x = null;
+$y = $x ?? {
+    echo "Executed\n";
+    42
+};
+var_dump($y);
+
+$x = 42;
+$y = $x ?? {
+    echo "Never executed\n";
+};
+var_dump($y);
+?>
+--EXPECT--
+Executed
+int(42)
+int(42)

Zend/tests/block_expr/coalesce_assign.phpt

@@ -0,0 +1,21 @@
+--TEST--
+Coalesce assignment block
+--FILE--
+<?php
+$x = null;
+$x ??= {
+    echo "Executed\n";
+    42
+};
+var_dump($x);
+
+$x = 42;
+$x ??= {
+    echo "Never executed\n";
+};
+var_dump($x);
+?>
+--EXPECT--
+Executed
+int(42)
+int(42)

Zend/zend_language_parser.y

@@ -1179,6 +1179,8 @@ expr:
 			{ $$ = zend_ast_create_assign_op(ZEND_SR, $1, $3); }
 	|	variable T_COALESCE_EQUAL expr
 			{ $$ = zend_ast_create(ZEND_AST_ASSIGN_COALESCE, $1, $3); }
+	|	variable T_COALESCE_EQUAL block_expr
+			{ $$ = zend_ast_create(ZEND_AST_ASSIGN_COALESCE, $1, $3); }
 	|	variable T_INC { $$ = zend_ast_create(ZEND_AST_POST_INC, $1); }
 	|	T_INC variable { $$ = zend_ast_create(ZEND_AST_PRE_INC, $2); }
 	|	variable T_DEC { $$ = zend_ast_create(ZEND_AST_POST_DEC, $1); }
@@ -1244,6 +1246,8 @@ expr:
 			{ $$ = zend_ast_create(ZEND_AST_CONDITIONAL, $1, NULL, $4); }
 	|	expr T_COALESCE expr
 			{ $$ = zend_ast_create(ZEND_AST_COALESCE, $1, $3); }
+	|	expr T_COALESCE block_expr
+			{ $$ = zend_ast_create(ZEND_AST_COALESCE, $1, $3); }
 	|	internal_functions_in_yacc { $$ = $1; }
 	|	T_INT_CAST expr		{ $$ = zend_ast_create_cast(IS_LONG, $2); }
 	|	T_DOUBLE_CAST expr	{ $$ = zend_ast_create_cast(IS_DOUBLE, $2); }