zend_language_parser: Support all parameter syntax for clone()

Author: TimWolla

Zend/tests/clone/ast.phpt

@@ -18,6 +18,12 @@ try {
 	echo $e->getMessage(), PHP_EOL;
 }
 
+try {
+	assert(false && $y = clone($x, ));
+} catch (Error $e) {
+	echo $e->getMessage(), PHP_EOL;
+}
+
 try {
 	assert(false && $y = clone($x, [ "foo" => $foo, "bar" => $bar ]));
 } catch (Error $e) {
@@ -30,6 +36,42 @@ try {
 	echo $e->getMessage(), PHP_EOL;
 }
 
+try {
+	assert(false && $y = clone($x, $array, $extraParameter, $trailingComma, ));
+} catch (Error $e) {
+	echo $e->getMessage(), PHP_EOL;
+}
+
+try {
+	assert(false && $y = clone(object: $x, withProperties: [ "foo" => $foo, "bar" => $bar ]));
+} catch (Error $e) {
+	echo $e->getMessage(), PHP_EOL;
+}
+
+try {
+	assert(false && $y = clone($x, withProperties: [ "foo" => $foo, "bar" => $bar ]));
+} catch (Error $e) {
+	echo $e->getMessage(), PHP_EOL;
+}
+
+try {
+	assert(false && $y = clone(object: $x));
+} catch (Error $e) {
+	echo $e->getMessage(), PHP_EOL;
+}
+
+try {
+	assert(false && $y = clone(object: $x, [ "foo" => $foo, "bar" => $bar ]));
+} catch (Error $e) {
+	echo $e->getMessage(), PHP_EOL;
+}
+
+try {
+	assert(false && $y = clone(...["object" => $x, "withProperties" => [ "foo" => $foo, "bar" => $bar ]]));
+} catch (Error $e) {
+	echo $e->getMessage(), PHP_EOL;
+}
+
 try {
 	assert(false && $y = clone(...));
 } catch (Error $e) {
@@ -40,6 +82,13 @@ try {
 --EXPECT--
 assert(false && ($y = \clone($x)))
 assert(false && ($y = \clone($x)))
+assert(false && ($y = \clone($x)))
 assert(false && ($y = \clone($x, ['foo' => $foo, 'bar' => $bar])))
 assert(false && ($y = \clone($x, $array)))
+assert(false && ($y = \clone($x, $array, $extraParameter, $trailingComma)))
+assert(false && ($y = \clone(object: $x, withProperties: ['foo' => $foo, 'bar' => $bar])))
+assert(false && ($y = \clone($x, withProperties: ['foo' => $foo, 'bar' => $bar])))
+assert(false && ($y = \clone(object: $x)))
+assert(false && ($y = \clone(object: $x, ['foo' => $foo, 'bar' => $bar])))
+assert(false && ($y = \clone(...['object' => $x, 'withProperties' => ['foo' => $foo, 'bar' => $bar]])))
 assert(false && ($y = \clone(...)))

Zend/zend_language_parser.y

@@ -46,7 +46,7 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
 %define api.pure full
 %define api.value.type {zend_parser_stack_elem}
 %define parse.error verbose
-%expect 0
+%expect 1
 
 %destructor { zend_ast_destroy($$); } <ast>
 %destructor { if ($$) zend_string_release_ex($$, 0); } <str>
@@ -1228,15 +1228,10 @@ expr:
 			{ $$ = zend_ast_create(ZEND_AST_ASSIGN, $1, $3); }
 	|	variable '=' ampersand variable
 			{ $$ = zend_ast_create(ZEND_AST_ASSIGN_REF, $1, $4); }
-	|	T_CLONE '(' T_ELLIPSIS ')' {
+	|	T_CLONE argument_list {
 			zend_ast *name = zend_ast_create_zval_from_str(ZSTR_KNOWN(ZEND_STR_CLONE));
 			name->attr = ZEND_NAME_FQ;
-			$$ = zend_ast_create(ZEND_AST_CALL, name, zend_ast_create_fcc());
-		}
-	|	T_CLONE '(' expr ',' expr ')' {
-			zend_ast *name = zend_ast_create_zval_from_str(ZSTR_KNOWN(ZEND_STR_CLONE));
-			name->attr = ZEND_NAME_FQ;
-			$$ = zend_ast_create(ZEND_AST_CALL, name, zend_ast_create_list(2, ZEND_AST_ARG_LIST, $3, $5));
+			$$ = zend_ast_create(ZEND_AST_CALL, name, $2);
 		}
 	|	T_CLONE expr {
 			zend_ast *name = zend_ast_create_zval_from_str(ZSTR_KNOWN(ZEND_STR_CLONE));