From 73757ab1265b05ae2c50474e07331588246ae60d Mon Sep 17 00:00:00 2001
From: Sara Golemon <pollita@php.net>
Date: Thu, 21 Feb 2013 03:04:00 -0800
Subject: [PATCH 1/2] Allow trailing comma after function declaration and
 callsites.

---
 ...function_arguments_trailing_comma_001.phpt | 27 +++++++++++++++++++
 ...function_arguments_trailing_comma_002.phpt | 27 +++++++++++++++++++
 ...function_arguments_trailing_comma_003.phpt |  8 ++++++
 ...function_arguments_trailing_comma_004.phpt |  8 ++++++
 ...function_arguments_trailing_comma_005.phpt |  8 ++++++
 ...function_arguments_trailing_comma_006.phpt |  8 ++++++
 ...function_arguments_trailing_comma_007.phpt |  7 +++++
 ...function_arguments_trailing_comma_008.phpt |  7 +++++
 ...function_arguments_trailing_comma_009.phpt |  7 +++++
 ...function_arguments_trailing_comma_010.phpt |  8 ++++++
 Zend/zend_language_parser.y                   |  4 +--
 11 files changed, 117 insertions(+), 2 deletions(-)
 create mode 100644 Zend/tests/function_arguments_trailing_comma_001.phpt
 create mode 100644 Zend/tests/function_arguments_trailing_comma_002.phpt
 create mode 100644 Zend/tests/function_arguments_trailing_comma_003.phpt
 create mode 100644 Zend/tests/function_arguments_trailing_comma_004.phpt
 create mode 100644 Zend/tests/function_arguments_trailing_comma_005.phpt
 create mode 100644 Zend/tests/function_arguments_trailing_comma_006.phpt
 create mode 100644 Zend/tests/function_arguments_trailing_comma_007.phpt
 create mode 100644 Zend/tests/function_arguments_trailing_comma_008.phpt
 create mode 100644 Zend/tests/function_arguments_trailing_comma_009.phpt
 create mode 100644 Zend/tests/function_arguments_trailing_comma_010.phpt

diff --git a/Zend/tests/function_arguments_trailing_comma_001.phpt b/Zend/tests/function_arguments_trailing_comma_001.phpt
new file mode 100644
index 0000000000000..92abe6c41e09b
--- /dev/null
+++ b/Zend/tests/function_arguments_trailing_comma_001.phpt
@@ -0,0 +1,27 @@
+--TEST--
+Trailing commas in function argument declarations
+--FILE--
+<?php
+function globalFunc($a,) {
+  var_dump(__FUNCTION__, $a);
+}
+$closure = function($b,) {
+  var_dump(__FUNCTION__, $b);
+};
+class bar {
+  static public function baz($c,) {
+    var_dump(__CLASS__, __METHOD__, $c);
+  }
+}
+
+globalFunc(123);
+$closure("456");
+bar::baz(true);
+--EXPECT--
+string(10) "globalFunc"
+int(123)
+string(9) "{closure}"
+string(3) "456"
+string(3) "bar"
+string(8) "bar::baz"
+bool(true)
diff --git a/Zend/tests/function_arguments_trailing_comma_002.phpt b/Zend/tests/function_arguments_trailing_comma_002.phpt
new file mode 100644
index 0000000000000..90e1a1351efbc
--- /dev/null
+++ b/Zend/tests/function_arguments_trailing_comma_002.phpt
@@ -0,0 +1,27 @@
+--TEST--
+Trailing commas in function calls
+--FILE--
+<?php
+function globalFunc($a) {
+  var_dump(__FUNCTION__, $a);
+}
+$closure = function($b) {
+  var_dump(__FUNCTION__, $b);
+};
+class bar {
+  static public function baz($c) {
+    var_dump(__CLASS__, __METHOD__, $c);
+  }
+}
+
+globalFunc(123,);
+$closure("456",);
+bar::baz(true,);
+--EXPECT--
+string(10) "globalFunc"
+int(123)
+string(9) "{closure}"
+string(3) "456"
+string(3) "bar"
+string(8) "bar::baz"
+bool(true)
diff --git a/Zend/tests/function_arguments_trailing_comma_003.phpt b/Zend/tests/function_arguments_trailing_comma_003.phpt
new file mode 100644
index 0000000000000..bea36e077605e
--- /dev/null
+++ b/Zend/tests/function_arguments_trailing_comma_003.phpt
@@ -0,0 +1,8 @@
+--TEST--
+Comma in empty argument list
+--FILE--
+<?php
+function globalFunc(,) {
+}
+--EXPECTF--
+Parse error: syntax error, unexpected ',', expecting '&' or variable (T_VARIABLE) in %s/Zend/tests/function_arguments_trailing_comma_003.php on line 2
diff --git a/Zend/tests/function_arguments_trailing_comma_004.phpt b/Zend/tests/function_arguments_trailing_comma_004.phpt
new file mode 100644
index 0000000000000..ddf7766379c7b
--- /dev/null
+++ b/Zend/tests/function_arguments_trailing_comma_004.phpt
@@ -0,0 +1,8 @@
+--TEST--
+Double trailing comma in argument list
+--FILE--
+<?php
+function globalFunc($foo,,) {
+}
+--EXPECTF--
+Parse error: syntax error, unexpected ',', expecting '&' or variable (T_VARIABLE) in %s/Zend/tests/function_arguments_trailing_comma_004.php on line 2
diff --git a/Zend/tests/function_arguments_trailing_comma_005.phpt b/Zend/tests/function_arguments_trailing_comma_005.phpt
new file mode 100644
index 0000000000000..9d6e16d7c65ab
--- /dev/null
+++ b/Zend/tests/function_arguments_trailing_comma_005.phpt
@@ -0,0 +1,8 @@
+--TEST--
+Leading comma in argument list
+--FILE--
+<?php
+function globalFunc(,$foo) {
+}
+--EXPECTF--
+Parse error: syntax error, unexpected ',', expecting '&' or variable (T_VARIABLE) in %s/Zend/tests/function_arguments_trailing_comma_005.php on line 2
diff --git a/Zend/tests/function_arguments_trailing_comma_006.phpt b/Zend/tests/function_arguments_trailing_comma_006.phpt
new file mode 100644
index 0000000000000..230a51bae484b
--- /dev/null
+++ b/Zend/tests/function_arguments_trailing_comma_006.phpt
@@ -0,0 +1,8 @@
+--TEST--
+Repeated commas mid-argument list
+--FILE--
+<?php
+function globalFunc($a,,$b) {
+}
+--EXPECTF--
+Parse error: syntax error, unexpected ',', expecting '&' or variable (T_VARIABLE) in %s/Zend/tests/function_arguments_trailing_comma_006.php on line 2
diff --git a/Zend/tests/function_arguments_trailing_comma_007.phpt b/Zend/tests/function_arguments_trailing_comma_007.phpt
new file mode 100644
index 0000000000000..3a2f67c4d13cc
--- /dev/null
+++ b/Zend/tests/function_arguments_trailing_comma_007.phpt
@@ -0,0 +1,7 @@
+--TEST--
+Comma in empty fcall list
+--FILE--
+<?php
+phpinfo(,);
+--EXPECTF--
+Parse error: syntax error, unexpected ',' in %s/Zend/tests/function_arguments_trailing_comma_007.php on line 2
diff --git a/Zend/tests/function_arguments_trailing_comma_008.phpt b/Zend/tests/function_arguments_trailing_comma_008.phpt
new file mode 100644
index 0000000000000..4a889ba3c4046
--- /dev/null
+++ b/Zend/tests/function_arguments_trailing_comma_008.phpt
@@ -0,0 +1,7 @@
+--TEST--
+Double trailing commas in fcall argument list
+--FILE--
+<?php
+strlen(123,,);
+--EXPECTF--
+Parse error: syntax error, unexpected ',', expecting ')' in %s/Zend/tests/function_arguments_trailing_comma_008.php on line 2
diff --git a/Zend/tests/function_arguments_trailing_comma_009.phpt b/Zend/tests/function_arguments_trailing_comma_009.phpt
new file mode 100644
index 0000000000000..2e59ae0270d81
--- /dev/null
+++ b/Zend/tests/function_arguments_trailing_comma_009.phpt
@@ -0,0 +1,7 @@
+--TEST--
+Leading comma in fcall list
+--FILE--
+<?php
+strlen(,"123");
+--EXPECTF--
+Parse error: syntax error, unexpected ',' in %s/Zend/tests/function_arguments_trailing_comma_009.php on line 2
diff --git a/Zend/tests/function_arguments_trailing_comma_010.phpt b/Zend/tests/function_arguments_trailing_comma_010.phpt
new file mode 100644
index 0000000000000..fee7c224edc42
--- /dev/null
+++ b/Zend/tests/function_arguments_trailing_comma_010.phpt
@@ -0,0 +1,8 @@
+--TEST--
+Double comma in fcall list
+--FILE--
+<?php
+function testFunc() {}
+testFunc(1,,2);
+--EXPECTF--
+Parse error: syntax error, unexpected ',', expecting ')' in %s/Zend/tests/function_arguments_trailing_comma_010.php on line 3
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index ccbc9b174c9d4..cf6679f05cb7d 100644
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -515,7 +515,7 @@ new_else_single:
 
 
 parameter_list:
-		non_empty_parameter_list
+		non_empty_parameter_list possible_comma
 	|	/* empty */
 ;
 
@@ -542,7 +542,7 @@ optional_class_type:
 
 function_call_parameter_list:
 		'(' ')'	{ Z_LVAL($$.u.constant) = 0; }
-	|	'(' non_empty_function_call_parameter_list ')'	{ $$ = $2; }
+	|	'(' non_empty_function_call_parameter_list possible_comma ')'	{ $$ = $2; }
 	|	'(' yield_expr ')'	{ Z_LVAL($$.u.constant) = 1; zend_do_pass_param(&$2, ZEND_SEND_VAL, Z_LVAL($$.u.constant) TSRMLS_CC); }
 ;
 

From 917bfa213257641a9689e82718d7b9045fb05e87 Mon Sep 17 00:00:00 2001
From: Sara Golemon <pollita@php.net>
Date: Thu, 21 Feb 2013 03:04:00 -0800
Subject: [PATCH 2/2] Allow trailing comma after function declaration and
 callsites.

---
 ...function_arguments_trailing_comma_001.phpt | 27 +++++++++++++++++++
 ...function_arguments_trailing_comma_002.phpt | 27 +++++++++++++++++++
 ...function_arguments_trailing_comma_003.phpt |  8 ++++++
 ...function_arguments_trailing_comma_004.phpt |  8 ++++++
 ...function_arguments_trailing_comma_005.phpt |  8 ++++++
 ...function_arguments_trailing_comma_006.phpt |  8 ++++++
 ...function_arguments_trailing_comma_007.phpt |  7 +++++
 ...function_arguments_trailing_comma_008.phpt |  7 +++++
 ...function_arguments_trailing_comma_009.phpt |  7 +++++
 ...function_arguments_trailing_comma_010.phpt |  8 ++++++
 Zend/zend_language_parser.y                   |  4 +--
 11 files changed, 117 insertions(+), 2 deletions(-)
 create mode 100644 Zend/tests/function_arguments_trailing_comma_001.phpt
 create mode 100644 Zend/tests/function_arguments_trailing_comma_002.phpt
 create mode 100644 Zend/tests/function_arguments_trailing_comma_003.phpt
 create mode 100644 Zend/tests/function_arguments_trailing_comma_004.phpt
 create mode 100644 Zend/tests/function_arguments_trailing_comma_005.phpt
 create mode 100644 Zend/tests/function_arguments_trailing_comma_006.phpt
 create mode 100644 Zend/tests/function_arguments_trailing_comma_007.phpt
 create mode 100644 Zend/tests/function_arguments_trailing_comma_008.phpt
 create mode 100644 Zend/tests/function_arguments_trailing_comma_009.phpt
 create mode 100644 Zend/tests/function_arguments_trailing_comma_010.phpt

diff --git a/Zend/tests/function_arguments_trailing_comma_001.phpt b/Zend/tests/function_arguments_trailing_comma_001.phpt
new file mode 100644
index 0000000000000..92abe6c41e09b
--- /dev/null
+++ b/Zend/tests/function_arguments_trailing_comma_001.phpt
@@ -0,0 +1,27 @@
+--TEST--
+Trailing commas in function argument declarations
+--FILE--
+<?php
+function globalFunc($a,) {
+  var_dump(__FUNCTION__, $a);
+}
+$closure = function($b,) {
+  var_dump(__FUNCTION__, $b);
+};
+class bar {
+  static public function baz($c,) {
+    var_dump(__CLASS__, __METHOD__, $c);
+  }
+}
+
+globalFunc(123);
+$closure("456");
+bar::baz(true);
+--EXPECT--
+string(10) "globalFunc"
+int(123)
+string(9) "{closure}"
+string(3) "456"
+string(3) "bar"
+string(8) "bar::baz"
+bool(true)
diff --git a/Zend/tests/function_arguments_trailing_comma_002.phpt b/Zend/tests/function_arguments_trailing_comma_002.phpt
new file mode 100644
index 0000000000000..90e1a1351efbc
--- /dev/null
+++ b/Zend/tests/function_arguments_trailing_comma_002.phpt
@@ -0,0 +1,27 @@
+--TEST--
+Trailing commas in function calls
+--FILE--
+<?php
+function globalFunc($a) {
+  var_dump(__FUNCTION__, $a);
+}
+$closure = function($b) {
+  var_dump(__FUNCTION__, $b);
+};
+class bar {
+  static public function baz($c) {
+    var_dump(__CLASS__, __METHOD__, $c);
+  }
+}
+
+globalFunc(123,);
+$closure("456",);
+bar::baz(true,);
+--EXPECT--
+string(10) "globalFunc"
+int(123)
+string(9) "{closure}"
+string(3) "456"
+string(3) "bar"
+string(8) "bar::baz"
+bool(true)
diff --git a/Zend/tests/function_arguments_trailing_comma_003.phpt b/Zend/tests/function_arguments_trailing_comma_003.phpt
new file mode 100644
index 0000000000000..bea36e077605e
--- /dev/null
+++ b/Zend/tests/function_arguments_trailing_comma_003.phpt
@@ -0,0 +1,8 @@
+--TEST--
+Comma in empty argument list
+--FILE--
+<?php
+function globalFunc(,) {
+}
+--EXPECTF--
+Parse error: syntax error, unexpected ',', expecting '&' or variable (T_VARIABLE) in %s/Zend/tests/function_arguments_trailing_comma_003.php on line 2
diff --git a/Zend/tests/function_arguments_trailing_comma_004.phpt b/Zend/tests/function_arguments_trailing_comma_004.phpt
new file mode 100644
index 0000000000000..ddf7766379c7b
--- /dev/null
+++ b/Zend/tests/function_arguments_trailing_comma_004.phpt
@@ -0,0 +1,8 @@
+--TEST--
+Double trailing comma in argument list
+--FILE--
+<?php
+function globalFunc($foo,,) {
+}
+--EXPECTF--
+Parse error: syntax error, unexpected ',', expecting '&' or variable (T_VARIABLE) in %s/Zend/tests/function_arguments_trailing_comma_004.php on line 2
diff --git a/Zend/tests/function_arguments_trailing_comma_005.phpt b/Zend/tests/function_arguments_trailing_comma_005.phpt
new file mode 100644
index 0000000000000..9d6e16d7c65ab
--- /dev/null
+++ b/Zend/tests/function_arguments_trailing_comma_005.phpt
@@ -0,0 +1,8 @@
+--TEST--
+Leading comma in argument list
+--FILE--
+<?php
+function globalFunc(,$foo) {
+}
+--EXPECTF--
+Parse error: syntax error, unexpected ',', expecting '&' or variable (T_VARIABLE) in %s/Zend/tests/function_arguments_trailing_comma_005.php on line 2
diff --git a/Zend/tests/function_arguments_trailing_comma_006.phpt b/Zend/tests/function_arguments_trailing_comma_006.phpt
new file mode 100644
index 0000000000000..230a51bae484b
--- /dev/null
+++ b/Zend/tests/function_arguments_trailing_comma_006.phpt
@@ -0,0 +1,8 @@
+--TEST--
+Repeated commas mid-argument list
+--FILE--
+<?php
+function globalFunc($a,,$b) {
+}
+--EXPECTF--
+Parse error: syntax error, unexpected ',', expecting '&' or variable (T_VARIABLE) in %s/Zend/tests/function_arguments_trailing_comma_006.php on line 2
diff --git a/Zend/tests/function_arguments_trailing_comma_007.phpt b/Zend/tests/function_arguments_trailing_comma_007.phpt
new file mode 100644
index 0000000000000..3a2f67c4d13cc
--- /dev/null
+++ b/Zend/tests/function_arguments_trailing_comma_007.phpt
@@ -0,0 +1,7 @@
+--TEST--
+Comma in empty fcall list
+--FILE--
+<?php
+phpinfo(,);
+--EXPECTF--
+Parse error: syntax error, unexpected ',' in %s/Zend/tests/function_arguments_trailing_comma_007.php on line 2
diff --git a/Zend/tests/function_arguments_trailing_comma_008.phpt b/Zend/tests/function_arguments_trailing_comma_008.phpt
new file mode 100644
index 0000000000000..4a889ba3c4046
--- /dev/null
+++ b/Zend/tests/function_arguments_trailing_comma_008.phpt
@@ -0,0 +1,7 @@
+--TEST--
+Double trailing commas in fcall argument list
+--FILE--
+<?php
+strlen(123,,);
+--EXPECTF--
+Parse error: syntax error, unexpected ',', expecting ')' in %s/Zend/tests/function_arguments_trailing_comma_008.php on line 2
diff --git a/Zend/tests/function_arguments_trailing_comma_009.phpt b/Zend/tests/function_arguments_trailing_comma_009.phpt
new file mode 100644
index 0000000000000..2e59ae0270d81
--- /dev/null
+++ b/Zend/tests/function_arguments_trailing_comma_009.phpt
@@ -0,0 +1,7 @@
+--TEST--
+Leading comma in fcall list
+--FILE--
+<?php
+strlen(,"123");
+--EXPECTF--
+Parse error: syntax error, unexpected ',' in %s/Zend/tests/function_arguments_trailing_comma_009.php on line 2
diff --git a/Zend/tests/function_arguments_trailing_comma_010.phpt b/Zend/tests/function_arguments_trailing_comma_010.phpt
new file mode 100644
index 0000000000000..fee7c224edc42
--- /dev/null
+++ b/Zend/tests/function_arguments_trailing_comma_010.phpt
@@ -0,0 +1,8 @@
+--TEST--
+Double comma in fcall list
+--FILE--
+<?php
+function testFunc() {}
+testFunc(1,,2);
+--EXPECTF--
+Parse error: syntax error, unexpected ',', expecting ')' in %s/Zend/tests/function_arguments_trailing_comma_010.php on line 3
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index ccbc9b174c9d4..cf6679f05cb7d 100644
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -515,7 +515,7 @@ new_else_single:
 
 
 parameter_list:
-		non_empty_parameter_list
+		non_empty_parameter_list possible_comma
 	|	/* empty */
 ;
 
@@ -542,7 +542,7 @@ optional_class_type:
 
 function_call_parameter_list:
 		'(' ')'	{ Z_LVAL($$.u.constant) = 0; }
-	|	'(' non_empty_function_call_parameter_list ')'	{ $$ = $2; }
+	|	'(' non_empty_function_call_parameter_list possible_comma ')'	{ $$ = $2; }
 	|	'(' yield_expr ')'	{ Z_LVAL($$.u.constant) = 1; zend_do_pass_param(&$2, ZEND_SEND_VAL, Z_LVAL($$.u.constant) TSRMLS_CC); }
 ;