VKCOM · mkornaukhov03 · Oct 31, 2022 · Nov 28, 2022 · Feb 8, 2023 · Feb 15, 2023
diff --git a/compiler/gentree.cpp b/compiler/gentree.cpp
@@ -14,12 +14,14 @@
 #include "compiler/data/function-data.h"
 #include "compiler/data/lib-data.h"
 #include "compiler/data/src-file.h"
+#include "compiler/data/vertex-adaptor.h"
 #include "compiler/data/generics-mixins.h"
 #include "compiler/lambda-utils.h"
 #include "compiler/lexer.h"
 #include "compiler/name-gen.h"
 #include "compiler/phpdoc.h"
 #include "compiler/stage.h"
+#include "compiler/token.h"
 #include "compiler/type-hint.h"
 #include "compiler/utils/string-utils.h"
 #include "compiler/vertex.h"
@@ -97,6 +99,9 @@ VertexPtr GenTree::get_foreach_value() {
 }
 
 VertexAdaptor<op_var> GenTree::get_function_use_var_name_ref() {
+  if (cur->type() == tok_clpar) { // for trailing comma
+    return {};
+  }
   auto result = get_var_name_ref();
   kphp_error(result, fmt_format("function use list: expected varname, found {}", cur->str_val));
   kphp_error(!result->ref_flag, "references to variables in `use` block are forbidden in lambdas");
@@ -1377,7 +1382,7 @@ bool GenTree::parse_cur_function_uses() {
   }
 
   std::vector<VertexAdaptor<op_var>> uses_as_vars;
-  gen_list<op_err>(&uses_as_vars, &GenTree::get_function_use_var_name_ref, tok_comma);
+  gen_list<op_none>(&uses_as_vars, &GenTree::get_function_use_var_name_ref, tok_comma);
 
   for (auto &v : uses_as_vars) {
     cur_function->uses_list.emplace_front(v);   // the order — use($v1, $v2) or use($v2, $v1) — doesn't matter
@@ -1494,7 +1499,7 @@ VertexAdaptor<op_func_param_list> GenTree::parse_cur_function_param_list() {
     params_next.emplace_back(ClassData::gen_param_this(auto_location()));
   }
 
-  bool ok_params_next = gen_list<op_err>(&params_next, &GenTree::get_func_param, tok_comma);
+  bool ok_params_next = gen_list<op_none>(&params_next, &GenTree::get_func_param, tok_comma);
   CE(!kphp_error(ok_params_next, "Failed to parse function params"));
   CE(expect(tok_clpar, "')'"));
 

diff --git a/...parsing/php7_4/arglist_trailing_comma.php → ...parsing/php8_0/arglist_trailing_comma.php b/...parsing/php7_4/arglist_trailing_comma.php → ...parsing/php8_0/arglist_trailing_comma.php
@@ -1,4 +1,4 @@
-@ok
+@ok php8
 <?php
 
 // See https://wiki.php.net/rfc/trailing-comma-function-calls

diff --git a/...ng/php7_4/arglist_trailing_comma_bad1.php → ...ng/php8_0/arglist_trailing_comma_bad1.php b/...ng/php7_4/arglist_trailing_comma_bad1.php → ...ng/php8_0/arglist_trailing_comma_bad1.php
diff --git a/...ng/php7_4/arglist_trailing_comma_bad2.php → ...ng/php8_0/arglist_trailing_comma_bad2.php b/...ng/php7_4/arglist_trailing_comma_bad2.php → ...ng/php8_0/arglist_trailing_comma_bad2.php
diff --git a/...ng/php7_4/arglist_trailing_comma_bad3.php → ...ng/php8_0/arglist_trailing_comma_bad3.php b/...ng/php7_4/arglist_trailing_comma_bad3.php → ...ng/php8_0/arglist_trailing_comma_bad3.php
diff --git a/...ng/php7_4/arglist_trailing_comma_bad4.php → ...ng/php8_0/arglist_trailing_comma_decl.php b/...ng/php7_4/arglist_trailing_comma_bad4.php → ...ng/php8_0/arglist_trailing_comma_decl.php
@@ -1,4 +1,4 @@
-@kphp_should_fail
+@ok php8
 <?php
 
 function f($x, $y,) {} // Trailing comma is not allowed in decls
diff --git a/tests/phpt/php8/trailing_comma/001_function_args_trailing_comma.php b/tests/phpt/php8/trailing_comma/001_function_args_trailing_comma.php
@@ -0,0 +1,13 @@
+@ok php8
+<?php
+
+require_once 'kphp_tester_include.php';
+
+function foo(
+  $arg,
+  $arg2, // Ok
+) {
+    echo $arg . $arg2 . "\n";
+}
+
+foo("vk", "com");
diff --git a/tests/phpt/php8/trailing_comma/002_function_uses_trailing_comma.php b/tests/phpt/php8/trailing_comma/002_function_uses_trailing_comma.php
@@ -0,0 +1,15 @@
+@ok php8
+<?php
+
+require_once 'kphp_tester_include.php';
+
+$a = 'test1';
+$b = 'test2';
+$fn = function () use (
+    $a,
+    $b,
+) {
+   echo $a, $b;
+};
+
+$fn();
diff --git a/tests/phpt/php8/trailing_comma/101_function_args_trailing_comma_fail.php b/tests/phpt/php8/trailing_comma/101_function_args_trailing_comma_fail.php
@@ -0,0 +1,9 @@
+@kphp_should_fail php8
+<?php
+
+function foo(
+  $arg,
+  $arg2,, // Multiple trailing commas are not allowed
+) {
+    echo $arg . $arg2 . "\n";
+}
diff --git a/tests/phpt/php8/trailing_comma/102_function_args_trailing_comma_fail.php b/tests/phpt/php8/trailing_comma/102_function_args_trailing_comma_fail.php
@@ -0,0 +1,6 @@
+@kphp_should_fail php8
+<?php
+
+function foo(,) { // Free-standing commas are not allowed
+    echo $arg . "\n";
+}
-Original file line number
+Diff line change
@@ -1,4 +1,4 @@
-    @ok
+    @ok php8
     <?php
     // See https://wiki.php.net/rfc/trailing-comma-function-calls
@@ Expand Down @@