php5 test coverage

diff

@@ -226,9 +226,11 @@
 -226
 -227
 228
+-229
 230
 231
 232
+-233
 234
 235
 236
@@ -403,8 +405,6 @@
 528
 
 
--229
--233
 -283
 -284
 -285

node/expr/assign_op/t_assign_op_test.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/z7zmey/php-parser/node"
 	"github.com/z7zmey/php-parser/node/expr"
+	"github.com/z7zmey/php-parser/node/name"
 	"github.com/z7zmey/php-parser/node/stmt"
 	"github.com/z7zmey/php-parser/php5"
 	"github.com/z7zmey/php-parser/php7"
@@ -49,6 +50,67 @@ func TestAssignRef(t *testing.T) {
 	assertEqual(t, expected, actual)
 }
 
+func TestAssignRefNew(t *testing.T) {
+	src := `<? $a =& new Foo;`
+
+	expected := &stmt.StmtList{
+		Stmts: []node.Node{
+			&stmt.Expression{
+				Expr: &assign_op.AssignRef{
+					Variable:   &expr.Variable{VarName: &node.Identifier{Value: "$a"}},
+					Expression: &expr.New{
+						Class: &name.Name{
+							Parts: []node.Node{
+								&name.NamePart{Value: "Foo"},
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+
+	actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
+	assertEqual(t, expected, actual)
+
+	actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
+	assertEqual(t, expected, actual)
+}
+
+func TestAssignRefArgs(t *testing.T) {
+	src := `<? $a =& new Foo($b);`
+
+	expected := &stmt.StmtList{
+		Stmts: []node.Node{
+			&stmt.Expression{
+				Expr: &assign_op.AssignRef{
+					Variable:   &expr.Variable{VarName: &node.Identifier{Value: "$a"}},
+					Expression: &expr.New{
+						Class: &name.Name{
+							Parts: []node.Node{
+								&name.NamePart{Value: "Foo"},
+							},
+						},
+						Arguments: []node.Node{
+							&node.Argument{
+								Variadic: false,
+								IsReference: false,
+								Expr:  &expr.Variable{VarName: &node.Identifier{Value: "$b"}},
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+
+	actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
+	assertEqual(t, expected, actual)
+
+	actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
+	assertEqual(t, expected, actual)
+}
+
 func TestAssign(t *testing.T) {
 	src := `<? $a = $b;`
 

node/expr/t_new_test.go

@@ -15,7 +15,7 @@ import (
 )
 
 func TestNew(t *testing.T) {
-	src := `<? new Foo();`
+	src := `<? new Foo;`
 
 	expected := &stmt.StmtList{
 		Stmts: []node.Node{
@@ -26,7 +26,6 @@ func TestNew(t *testing.T) {
 							&name.NamePart{Value: "Foo"},
 						},
 					},
-					Arguments: []node.Node{},
 				},
 			},
 		},

php5/php5.go

@@ -4476,7 +4476,7 @@ yydefault:
 			positions.AddPosition(_new, positionBuilder.NewTokenNodePosition(yyDollar[4].token, yyDollar[5].node))
 
 			if yyDollar[6].nodesWithEndToken != nil {
-				_new := expr.NewNew(yyDollar[5].node, yyDollar[6].nodesWithEndToken.nodes)
+				_new = expr.NewNew(yyDollar[5].node, yyDollar[6].nodesWithEndToken.nodes)
 				positions.AddPosition(_new, positionBuilder.NewTokensPosition(yyDollar[4].token, yyDollar[6].nodesWithEndToken.endToken))
 			}
 			comments.AddComments(_new, comments[yyDollar[1].node])

php5/php5.y

@@ -1848,7 +1848,7 @@ expr_without_variable:
                 positions.AddPosition(_new, positionBuilder.NewTokenNodePosition($4, $5))
 
                 if $6 != nil {
-                    _new := expr.NewNew($5, $6.nodes)
+                    _new = expr.NewNew($5, $6.nodes)
                     positions.AddPosition(_new, positionBuilder.NewTokensPosition($4, $6.endToken))
                 }
                 comments.AddComments(_new, comments[$1])

php5/php5_test.go

@@ -261,7 +261,7 @@ CAD;
 		list(list($a)) = $b;
 
 		$a->foo();
-		new Foo();
+		new Foo;
 		new namespace\Foo();
 		new \Foo();
 		print($a);
@@ -326,6 +326,8 @@ CAD;
 		$a < $b;
 
 		$a =& $b;
+		$a =& new Foo;
+		$a =& new Foo($b);
 		$a = $b;
 		$a &= $b;
 		$a |= $b;
@@ -2111,7 +2113,6 @@ CAD;
 							&name.NamePart{Value: "Foo"},
 						},
 					},
-					Arguments: []node.Node{},
 				},
 			},
 			&stmt.Expression{
@@ -2514,6 +2515,37 @@ CAD;
 					Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}},
 				},
 			},
+			&stmt.Expression{
+				Expr: &assign_op.AssignRef{
+					Variable:   &expr.Variable{VarName: &node.Identifier{Value: "$a"}},
+					Expression: &expr.New{
+						Class: &name.Name{
+							Parts: []node.Node{
+								&name.NamePart{Value: "Foo"},
+							},
+						},
+					},
+				},
+			},
+			&stmt.Expression{
+				Expr: &assign_op.AssignRef{
+					Variable:   &expr.Variable{VarName: &node.Identifier{Value: "$a"}},
+					Expression: &expr.New{
+						Class: &name.Name{
+							Parts: []node.Node{
+								&name.NamePart{Value: "Foo"},
+							},
+						},
+						Arguments: []node.Node{
+							&node.Argument{
+								Variadic: false,
+								IsReference: false,
+								Expr:  &expr.Variable{VarName: &node.Identifier{Value: "$b"}},
+							},
+						},
+					},
+				},
+			},
 			&stmt.Expression{
 				Expr: &assign_op.Assign{
 					Variable:   &expr.Variable{VarName: &node.Identifier{Value: "$a"}},