test: allow only expressions

Zend/tests/short_function/global_declaration.phpt

@@ -0,0 +1,26 @@
+--TEST--
+Short global function declaration
+--FILE--
+<?php
+function buz(): int => 123;
+echo buz() . PHP_EOL;
+
+function compare(int $what, int $with): string => match(true) {
+     $what > $with => "greater",
+     $what < $with => "less",
+     $what == $with => "equals",
+    default => throw new Exception("Unreachable statement"),
+};
+
+var_dump(compare(1, 2));
+var_dump(compare(20, 10));
+var_dump(compare(5, 5));
+
+echo "done";
+?>
+--EXPECT--
+123
+string(4) "less"
+string(7) "greater"
+string(6) "equals"
+done

Zend/tests/short_function/short_method_declaration.phpt → Zend/tests/short_function/method_declaration.phpt

@@ -1,14 +1,14 @@
 --TEST--
-Short method function declaration
+Short function method declaration
 --FILE--
 <?php
 class Decorator {
   public $proxy;
-  function getId() = $this->proxy->id;
-  function getName() = $this->proxy->name;
+  function getId() => $this->proxy->id;
+  function getName() => $this->proxy->name;
 
-  function setId($value) = $this->proxy->id = $value;
-  function setName($value) = $this->proxy->name = $value;
+  function setId($value) => $this->proxy->id = $value;
+  function setName($value) => $this->proxy->name = $value;
 }
 
 $decorated = new stdClass;

Zend/tests/short_function/short_method_declaration2.phpt → Zend/tests/short_function/method_declaration2.phpt

@@ -1,10 +1,10 @@
 --TEST--
-Short method function declaration
+Short function method declaration
 --FILE--
 <?php
 class Describer {
-  function getType(): string = $this->type;
-  function getTypeName(): string = match($type) {
+  function getType(): string => $this->type;
+  function getTypeName(): string => match($type) {
     "variable" => "Variable",
     "function_return" => "Function Return Type",
     default => "unknown"

Zend/tests/short_function/possible_declaration.phpt

@@ -0,0 +1,11 @@
+--TEST--
+Test possible declarations for expr&stmt options
+--FILE--
+<?php
+function expr() => 123; // returns 123
+
+var_dump(expr());
+
+?>
+--EXPECT--
+int(123)

Zend/tests/type_declarations/intersection_types/invalid_types/invalid_nullable_type.phpt

@@ -7,4 +7,4 @@ function foo(): ?Countable&Iterator {}
 
 ?>
 --EXPECTF--
-Parse error: syntax error, unexpected token "&", expecting "=" or "{" in %s on line %d
+Parse error: syntax error, unexpected token "&", expecting "=>" or "{" in %s on line %d

Zend/zend_compile.c

@@ -8365,7 +8365,7 @@ static zend_op_array *zend_compile_func_decl_ex(
 		zend_compile_closure_uses(uses_ast);
 	}
 
-	if (ast->kind == ZEND_AST_ARROW_FUNC && decl->child[2]->kind != ZEND_AST_RETURN) {
+	if (decl->flags & ZEND_ACC_SHORT_DECLARATION && stmt_ast->kind != ZEND_AST_RETURN) {
 		bool needs_return = true;
 		if (op_array->fn_flags & ZEND_ACC_HAS_RETURN_TYPE) {
 			zend_arg_info *return_info = CG(active_op_array)->arg_info - 1;

Zend/zend_compile.h

@@ -333,7 +333,7 @@ typedef struct _zend_oparray_context {
 /* Class cannot be serialized or unserialized             |     |     |     */
 #define ZEND_ACC_NOT_SERIALIZABLE        (1 << 29) /*  X  |     |     |     */
 /*                                                        |     |     |     */
-/* Function Flags (unused: 29-30)                         |     |     |     */
+/* Function Flags (unused: 30)                            |     |     |     */
 /* ==============                                         |     |     |     */
 /*                                                        |     |     |     */
 /* deprecation flag                                       |     |     |     */
@@ -395,6 +395,9 @@ typedef struct _zend_oparray_context {
 /* has #[\Override] attribute                             |     |     |     */
 #define ZEND_ACC_OVERRIDE                (1 << 28) /*     |  X  |     |     */
 /*                                                        |     |     |     */
+/* Function returning by reference						  |     |     |     */
+#define ZEND_ACC_SHORT_DECLARATION       (1 << 29) /*     |  X  |     |     */
+/*                                                        |     |     |     */
 /* op_array uses strict mode types                        |     |     |     */
 #define ZEND_ACC_STRICT_TYPES            (1U << 31) /*    |  X  |     |     */
 

Zend/zend_language_parser.y

@@ -585,7 +585,8 @@ function_declaration_statement:
 
 function_body:
         '{' inner_statement_list '}'    { $$ = $2; }
-    |   '=' statement                   { $$ = $2; }
+    |   T_DOUBLE_ARROW expr ';'
+			{ $$ = $2; CG(extra_fn_flags) |= ZEND_ACC_SHORT_DECLARATION; }
 ;
 
 is_reference:
@@ -1035,7 +1036,8 @@ absolute_trait_method_reference:
 method_body:
 		';' /* abstract method */		{ $$ = NULL; }
 	|	'{' inner_statement_list '}'	{ $$ = $2; }
-	|	'=' statement	{ $$ = $2; }
+	|	T_DOUBLE_ARROW expr ';'
+	        { $$ = $2; CG(extra_fn_flags) |= ZEND_ACC_SHORT_DECLARATION; }
 ;
 
 property_modifiers:
@@ -1347,7 +1349,7 @@ inline_function:
 				  $5, $7, $11, $8, NULL); CG(extra_fn_flags) = $9; }
 	|	fn returns_ref backup_doc_comment '(' parameter_list ')' return_type
 		T_DOUBLE_ARROW backup_fn_flags backup_lex_pos expr backup_fn_flags
-			{ $$ = zend_ast_create_decl(ZEND_AST_ARROW_FUNC, $2 | $12, $1, $3,
+			{ $$ = zend_ast_create_decl(ZEND_AST_ARROW_FUNC, $2 | $12 | ZEND_ACC_SHORT_DECLARATION, $1, $3,
 				  NULL, $5, NULL, $11, $7, NULL);
 				  CG(extra_fn_flags) = $9; }
 ;