Support optional comma in closure use list

TysonAndre · TysonAndre · commit 4cf8b6f1c909 · 2020-07-21T13:01:27.000-04:00
RFC: https://wiki.php.net/rfc/trailing_comma_in_closure_use_list Discussion: https://externals.io/message/110715 The release manager has agreed to allow merging of RFCs that have near-unanimous votes. If an RFC ends up not achieving the required 2/3 majority at the time the announced voting period closes, this implementation commit will be reverted in time for the feature freeze. Closes GH-5793
diff --git a/Zend/tests/closure_use_trailing_comma.phpt b/Zend/tests/closure_use_trailing_comma.phpt
@@ -0,0 +1,17 @@
+--TEST--
+Closure use list can have trailing commas
+--FILE--
+<?php
+
+$b = 'test';
+$fn = function () use (
+    $b,
+    &$a,
+) {
+    $a = $b;
+};
+$fn();
+echo "$a\n";
+?>
+--EXPECT--
+test
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
@@ -1155,7 +1155,7 @@ returns_ref:
 
 lexical_vars:
 		%empty { $$ = NULL; }
-	|	T_USE '(' lexical_var_list ')' { $$ = $3; }
+	|	T_USE '(' lexical_var_list possible_comma ')' { $$ = $3; }
 ;
 
 lexical_var_list:

Original file line number	Diff line number	Diff line change
`@@ -1155,7 +1155,7 @@ returns_ref:`
`1155`	`1155`
`1156`	`1156`	`lexical_vars:`
`1157`	`1157`	`%empty { $$ = NULL; }`
`1158`		`- \| T_USE '(' lexical_var_list ')' { $$ = $3; }`
	`1158`	`+ \| T_USE '(' lexical_var_list possible_comma ')' { $$ = $3; }`
`1159`	`1159`	`;`
`1160`	`1160`
`1161`	`1161`	`lexical_var_list:`