Properly reject non-expression short function bodies.

Author: Crell

Zend/tests/short_functions/short-func-no-statement.phpt

@@ -0,0 +1,12 @@
+--TEST--
+Non-expression statements parse error in short functions.
+--FILE--
+<?php
+
+function test(array $a) => foreach ($a as $v) print $v;
+
+test([1, 2, 3]);
+
+?>
+--EXPECTF--
+Parse error: syntax error, unexpected token "foreach" in %s on line %d

Zend/tests/short_functions/short-method-no-statement.phpt

@@ -0,0 +1,19 @@
+--TEST--
+Short methods.
+--FILE--
+<?php
+
+class Test {
+
+    public function __construct(private int $b) {}
+
+    public function out(array $a) => foreach ($a as $v) print $v;
+}
+
+$t = new Test(1);
+
+print $t->out([1, 2, 3]) . PHP_EOL;
+
+?>
+--EXPECTF--
+Parse error: syntax error, unexpected token "foreach" in %s on line %d

Zend/zend_language_parser.y

@@ -549,7 +549,7 @@ function_declaration_statement:
 		{ $$ = zend_ast_create_decl(ZEND_AST_FUNC_DECL, $2 | $13, $1, $4,
 		      zend_ast_get_str($3), $6, NULL, $11, $8, NULL); CG(extra_fn_flags) = $9; }
    | function returns_ref T_STRING backup_doc_comment '(' parameter_list ')' return_type
-     	backup_fn_flags T_DOUBLE_ARROW inner_statement backup_fn_flags
+        backup_fn_flags T_DOUBLE_ARROW expr ';' backup_fn_flags
      		{ $$ = zend_ast_create_decl(ZEND_AST_FUNC_DECL, $2, $1, $4,
      		      zend_ast_get_str($3), $6, NULL, zend_ast_create(ZEND_AST_RETURN, $11), $8, NULL); CG(extra_fn_flags) = $9; }
 ;
@@ -927,7 +927,7 @@ absolute_trait_method_reference:
 method_body:
 		';' /* abstract method */		{ $$ = NULL; }
 	|	'{' inner_statement_list '}'	{ $$ = $2; }
-	|   T_DOUBLE_ARROW inner_statement  { $$ = zend_ast_create(ZEND_AST_RETURN, $2); }
+	|   T_DOUBLE_ARROW expr ';'  { $$ = zend_ast_create(ZEND_AST_RETURN, $2); }
 ;
 
 variable_modifiers: