From cebbac923c1c88a9f52ae34d97506d55a97f10aa Mon Sep 17 00:00:00 2001
From: Tyson Andre <tysonandre775@hotmail.com>
Date: Wed, 1 Jul 2020 13:28:39 -0400
Subject: [PATCH] Support optional comma in closure use list

RFC: https://wiki.php.net/rfc/trailing_comma_in_closure_use_list
Discussion: https://externals.io/message/110715
---
 Zend/tests/closure_use_trailing_comma.phpt | 17 +++++++++++++++++
 Zend/zend_language_parser.y                |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 Zend/tests/closure_use_trailing_comma.phpt

diff --git a/Zend/tests/closure_use_trailing_comma.phpt b/Zend/tests/closure_use_trailing_comma.phpt
new file mode 100644
index 0000000000000..7bf6e5ce886f0
--- /dev/null
+++ 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
index 8ec740a05c47d..a66066aa9eda2 100644
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -1132,7 +1132,7 @@ returns_ref:
 
 lexical_vars:
 		%empty { $$ = NULL; }
-	|	T_USE '(' lexical_var_list ')' { $$ = $3; }
+	|	T_USE '(' lexical_var_list possible_comma ')' { $$ = $3; }
 ;
 
 lexical_var_list: