Sync with RFC: no explicit use list

Author: arnaud-lb

Zend/tests/short_closures/002.phpt

@@ -19,18 +19,6 @@ function printFunctionSignature($f) {
         print '& ';
     }
     print '(...)';
-    $usedVars = $rf->getClosureUsedVariables();
-    if (count($usedVars) > 0) {
-        print ' use (';
-        $n = 0;
-        foreach ($usedVars as $var => $_) {
-            if ($n++ > 0) {
-                print ', ';
-            }
-            print $var;
-        }
-        print ')';
-    }
     $type = $rf->getReturnType();
     if ($type !== null) {
         print ': ' . $type->getName();
@@ -62,16 +50,6 @@ $f = fn (): Foo {
 
 printFunctionSignature($f);
 
-$f = fn () use ($a) {
-};
-
-printFunctionSignature($f);
-
-$f = fn () use ($a): Foo {
-};
-
-printFunctionSignature($f);
-
 $a = 1;
 $f = fn (): Foo {
     return $a;
@@ -89,7 +67,5 @@ fn (...)
 fn & (...)
 static fn (...)
 fn (...): Foo
-fn (...) use (a)
-fn (...) use (a): Foo
-fn (...) use (a): Foo
+fn (...): Foo
 #[Attr] fn (...): Foo

Zend/tests/short_closures/ast_export.phpt

@@ -7,12 +7,12 @@ zend.assertions=1
 
 $a = 1;
 
-assert(#[Attr] fn(DateTime $dt) use($a): DateTime {
+assert(#[Attr] fn(DateTime $dt): DateTime {
     return 1;
 } && false);
 
 --EXPECTF--
-Fatal error: Uncaught AssertionError: assert(#[Attr] fn(DateTime $dt) use($a): DateTime {
+Fatal error: Uncaught AssertionError: assert(#[Attr] fn(DateTime $dt): DateTime {
     return 1;
 } && false) in %s:%d
 Stack trace:

Zend/tests/short_closures/explicit_use.phpt

@@ -10,7 +10,7 @@ $d = 4;
 $e = 5;
 
 $f = fn ($x) {
-    $g = fn ($x) use (&$b) { return $a; };
+    $g = fn ($x) { return $a; };
     $h = fn () => $c;
     $i = function () use ($d, &$e) {};
 };
@@ -20,9 +20,7 @@ var_dump((new ReflectionFunction($f))->getStaticVariables());
 
 --EXPECT--
 Captures:
-array(5) {
-  ["b"]=>
-  int(2)
+array(4) {
   ["a"]=>
   int(1)
   ["c"]=>

Zend/tests/short_closures/nested_functions_001.phpt

@@ -6,9 +6,8 @@ Short closures: static vs capture precedence
 $a = 1;
 $b = 2;
 
-// static $a is initialized with explicitly used $a, as in long closures
-// $b is not auto-captured because it is defined before any use
-$f = fn () use ($a) {
+// $a and $b are not auto-captured because they are defined before any use
+$f = fn () {
     static $a;
     static $b;
     $ret = [$a, $b];
@@ -27,20 +26,20 @@ var_dump($f());
 Captures or statics:
 array(2) {
   ["a"]=>
-  int(1)
+  NULL
   ["b"]=>
   NULL
 }
 Results:
 array(2) {
   [0]=>
-  int(1)
+  NULL
   [1]=>
   NULL
 }
 array(2) {
   [0]=>
-  int(2)
+  int(1)
   [1]=>
   int(1)
 }

Zend/tests/short_closures/static_vars_002.phpt

@@ -6847,7 +6847,7 @@ static void find_implicit_binds_recursively(closure_info *info, zend_ast *ast) {
 		for (i = 0; i < list->children; i++) {
 			find_implicit_binds_recursively(info, list->child[i]);
 		}
-	} else if (ast->kind == ZEND_AST_CLOSURE || ast->kind == ZEND_AST_SHORT_CLOSURE) {
+	} else if (ast->kind == ZEND_AST_CLOSURE) {
 		/* For normal closures add the use() list. */
 		zend_ast_decl *closure_ast = (zend_ast_decl *) ast;
 		zend_ast *uses_ast = closure_ast->child[1];
@@ -6858,10 +6858,7 @@ static void find_implicit_binds_recursively(closure_info *info, zend_ast *ast) {
 				zend_hash_add_empty_element(&info->uses, zend_ast_get_str(uses_list->child[i]));
 			}
 		}
-		if (ast->kind == ZEND_AST_SHORT_CLOSURE) {
-			find_implicit_binds_recursively(info, closure_ast->child[2]);
-		}
-	} else if (ast->kind == ZEND_AST_ARROW_FUNC) {
+	} else if (ast->kind == ZEND_AST_ARROW_FUNC || ast->kind == ZEND_AST_SHORT_CLOSURE) {
 		/* For arrow functions recursively check the expression. */
 		zend_ast_decl *closure_ast = (zend_ast_decl *) ast;
 		find_implicit_binds_recursively(info, closure_ast->child[2]);

Zend/zend_compile.c

@@ -1218,11 +1218,6 @@ inline_function:
 			{ $$ = zend_ast_create_decl(ZEND_AST_SHORT_CLOSURE, $2 | $12, $1, $3,
 				  zend_string_init("{closure}", sizeof("{closure}") - 1, 0),
 				  $5, NULL, $10, $7, NULL); CG(extra_fn_flags) = $9; }
-	|	fn returns_ref backup_doc_comment '(' parameter_list ')' T_USE '(' lexical_var_list possible_comma ')' return_type
-		'{' backup_fn_flags inner_statement_list '}' backup_fn_flags
-			{ $$ = zend_ast_create_decl(ZEND_AST_SHORT_CLOSURE, $2 | $17, $1, $3,
-				  zend_string_init("{closure}", sizeof("{closure}") - 1, 0),
-				  $5, $9, $15, $12, NULL); CG(extra_fn_flags) = $14; }
 ;
 
 fn: