Switch to more explicit <- returns, allow omitting <- for terminating blocks

Author: iluuu1994

Zend/Optimizer/dce.c

@@ -154,6 +154,7 @@ static inline bool may_have_side_effects(
 		case ZEND_INCLUDE_OR_EVAL:
 		case ZEND_THROW:
 		case ZEND_MATCH_ERROR:
+		case ZEND_MATCH_BLOCK_NO_VALUE_ERROR:
 		case ZEND_EXT_STMT:
 		case ZEND_EXT_FCALL_BEGIN:
 		case ZEND_EXT_FCALL_END:

Zend/tests/match/block_arg_return.phpt

@@ -3,7 +3,7 @@ Match expression block must not use return
 --FILE--
 <?php
 foo(match (1) {
-    1 => { return; null }
+    1 => { return; }
 });
 ?>
 --EXPECTF--

Zend/tests/match/block_basic.phpt

@@ -12,11 +12,14 @@ function bar() {
 
 function test($value) {
     var_dump(match ($value) {
-        1 => { 1 },
-        2 => { $x = 2; $x },
+        1 => { <- 1; },
+        2 => {
+            $x = 2;
+            <- $x;
+        },
         3 => {
             foo();
-            bar()
+            <- bar();
         },
     });
 }

Zend/tests/match/block_expr_break_escape.phpt

@@ -3,7 +3,7 @@ Match expression block must not use break
 --FILE--
 <?php
 var_dump(match ($value) {
-    1 => { break; [] },
+    1 => { break; },
 });
 ?>
 --EXPECTF--

Zend/tests/match/block_expr_break_no_escape.phpt

@@ -8,7 +8,7 @@ var_dump(match (1) {
             echo $value, "\n";
             break;
         }
-        42
+        <- 42;
     },
 });
 ?>

Zend/tests/match/block_expr_goto_escape.phpt

@@ -5,7 +5,6 @@ Match expression block must not use goto
 var_dump(match (1) {
     1 => {
         goto after;
-        42
     },
 });
 after:

Zend/tests/match/block_expr_goto_into.phpt

@@ -6,7 +6,7 @@ goto in;
 var_dump(match (1) {
     1 => {
 in:
-        42
+        <- 42;
     },
 });
 ?>

Zend/tests/match/block_expr_no_result.phpt

@@ -2,11 +2,19 @@
 Match expression block must return a value
 --FILE--
 <?php
-var_dump(match (1) {
-    1 => {
-        echo "Not returning anything\n";
-    },
-});
+function test() {
+    var_dump(match (1) {
+        1 => {
+            echo "Not returning anything\n";
+        },
+    });
+}
+try {
+    test();
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
 ?>
---EXPECTF--
-Fatal error: Blocks of match expression with used result must return a value. Did you mean to omit the last semicolon? in %s on line %d
+--EXPECT--
+Not returning anything
+Match expected a value from block but none was returned

Zend/tests/match/block_expr_return.phpt

@@ -3,7 +3,7 @@ Match expression block must not use return
 --FILE--
 <?php
 var_dump(match ($value) {
-    1 => { return; [] },
+    1 => { return; },
 });
 ?>
 --EXPECTF--

Zend/tests/match/block_expr_throw.phpt

@@ -5,7 +5,7 @@ Throwing match expression block must clean up live-vars
 
 function throw_($value) {
     var_dump([new \stdClass] + match ($value) {
-        1 => { throw new Exception('Exception with live var'); [] },
+        1 => { throw new Exception('Exception with live var'); },
     });
 }