Use 'fn' for expression functions

Author: sgolemon

Zend/tests/short_functions/short-func-match.phpt

@@ -3,7 +3,7 @@ Short functions with match statements.
 --FILE--
 <?php
 
-function pick_one(int $a) => match($a) {
+fn pick_one(int $a) => match($a) {
     1 => 'One',
     2 => 'Two',
     3 => 'Three',

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

@@ -3,7 +3,7 @@ Non-expression statements parse error in short functions.
 --FILE--
 <?php
 
-function test(array $a) => foreach ($a as $v) print $v;
+fn test(array $a) => foreach ($a as $v) print $v;
 
 test([1, 2, 3]);
 

Zend/tests/short_functions/short-func.phpt

@@ -3,10 +3,9 @@ Basic short functions return values.
 --FILE--
 <?php
 
-function test(int $a) => $a + 1;
+fn test(int $a) => $a + 1;
 
-function test2(int $b): int
-    => $b + 1;
+fn test2(int $b): int => $b + 1;
 
 print test(5) . PHP_EOL;
 print test2(5) . PHP_EOL;

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

@@ -7,7 +7,7 @@ class Test {
 
     public function __construct(private int $b) {}
 
-    public function out(array $a) => foreach ($a as $v) print $v;
+    public fn out(array $a) => foreach ($a as $v) print $v;
 }
 
 $t = new Test(1);

Zend/tests/short_functions/short-method.phpt

@@ -7,10 +7,9 @@ class Test {
 
     public function __construct(private int $b) {}
 
-    public function addUp(int $a) => $a + $this->b;
+    public fn addUp(int $a) => $a + $this->b;
 
-    public function addUp2(int $a): int
-        => $a + $this->b;
+    public fn addUp2(int $a): int => $a + $this->b;
 }
 
 $t = new Test(1);

Zend/zend_language_parser.y

@@ -548,7 +548,7 @@ function_declaration_statement:
 	backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
 		{ $$ = 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
+   | fn returns_ref T_STRING backup_doc_comment '(' parameter_list ')' return_type
         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; }
@@ -863,6 +863,11 @@ attributed_class_statement:
 		return_type backup_fn_flags method_body backup_fn_flags
 			{ $$ = zend_ast_create_decl(ZEND_AST_METHOD, $3 | $1 | $12, $2, $5,
 				  zend_ast_get_str($4), $7, NULL, $11, $9, NULL); CG(extra_fn_flags) = $10; }
+	|	method_modifiers fn returns_ref identifier backup_doc_comment '(' parameter_list ')'
+		return_type backup_fn_flags T_DOUBLE_ARROW expr ';' backup_fn_flags
+			{ $$ = zend_ast_create_decl(ZEND_AST_METHOD, $3 | $1 | $14, $2, $5,
+				  zend_ast_get_str($4), $7, NULL, zend_ast_create(ZEND_AST_RETURN, $12), $9, NULL);
+				  CG(extra_fn_flags) = $10; }
 ;
 
 class_statement: