maride/php-parser
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update tests

Browse Source
This commit is contained in:
z7zmey 2018-04-09 23:26:44 +03:00
parent 83a1400a4f
commit 6ff2beafa3
76 changed files with 603 additions and 532 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -12,6 +12,9 @@ run:
./php-parser $(PHPFILE)
test:
go test ./...
cover:
go test ./... --cover
bench:

68
errors/error_test.go Normal file
View File

@ -0,0 +1,68 @@
package errors_test
import (
"reflect"
"testing"
"github.com/z7zmey/php-parser/position"
"github.com/z7zmey/php-parser/errors"
"github.com/z7zmey/php-parser/token"
"github.com/kylelemons/godebug/pretty"
)
func assertEqual(t *testing.T, expected interface{}, actual interface{}) {
if !reflect.DeepEqual(expected, actual) {
diff := pretty.Compare(expected, actual)
if diff != "" {
t.Errorf("diff: (-expected +actual)\n%s", diff)
} else {
t.Errorf("expected and actual are not equal\n")
}
}
}
func TestConstructor(t *testing.T) {
token := token.Token{
Value: "test",
StartLine: 1,
EndLine: 2,
StartPos: 3,
EndPos: 4,
}
actual := errors.NewError("message", token)
expected := &errors.Error{
Msg: "message",
Pos: position.Position{
StartLine: 1,
EndLine: 2,
StartPos: 3,
EndPos: 4,
},
}
assertEqual(t, expected, actual)
}
func TestPrint(t *testing.T) {
token := token.Token{
Value: "test",
StartLine: 1,
EndLine: 2,
StartPos: 3,
EndPos: 4,
}
Error := errors.NewError("message", token)
actual := Error.String()
expected := "message at line 1"
assertEqual(t, expected, actual)
}

64
node/expr/assign/t_assign_op_test.go
View File

@ -43,10 +43,10 @@ func TestReference(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -70,10 +70,10 @@ func TestReferenceNew(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -104,10 +104,10 @@ func TestReferenceArgs(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -125,10 +125,10 @@ func TestAssign(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -146,10 +146,10 @@ func TestBitwiseAnd(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -167,10 +167,10 @@ func TestBitwiseOr(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -188,10 +188,10 @@ func TestBitwiseXor(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -209,10 +209,10 @@ func TestConcat(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -230,10 +230,10 @@ func TestDiv(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -251,10 +251,10 @@ func TestMinus(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -272,10 +272,10 @@ func TestMod(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -293,10 +293,10 @@ func TestMul(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -314,10 +314,10 @@ func TestPlus(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -335,10 +335,10 @@ func TestPow(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -356,10 +356,10 @@ func TestShiftLeft(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -377,9 +377,9 @@ func TestShiftRight(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

104
node/expr/binary/t_binary_op_test.go
View File

@ -41,10 +41,10 @@ func TestBitwiseAnd(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -62,10 +62,10 @@ func TestBitwiseOr(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -83,10 +83,10 @@ func TestBitwiseXor(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -104,10 +104,10 @@ func TestBooleanAnd(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -125,10 +125,10 @@ func TestBooleanOr(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -146,7 +146,7 @@ func TestCoalesce(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -164,10 +164,10 @@ func TestConcat(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -185,10 +185,10 @@ func TestDiv(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -206,10 +206,10 @@ func TestEqual(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -227,10 +227,10 @@ func TestGreaterOrEqual(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -248,10 +248,10 @@ func TestGreater(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -269,10 +269,10 @@ func TestIdentical(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -290,10 +290,10 @@ func TestLogicalAnd(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -311,10 +311,10 @@ func TestLogicalOr(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -332,10 +332,10 @@ func TestLogicalXor(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -353,10 +353,10 @@ func TestMinus(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -374,10 +374,10 @@ func TestMod(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -395,10 +395,10 @@ func TestMul(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -416,10 +416,10 @@ func TestNotEqual(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -437,10 +437,10 @@ func TestNotIdentical(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -458,10 +458,10 @@ func TestPlus(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -479,10 +479,10 @@ func TestPow(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -500,10 +500,10 @@ func TestShiftLeft(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -521,10 +521,10 @@ func TestShiftRight(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -542,10 +542,10 @@ func TestSmallerOrEqual(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -563,10 +563,10 @@ func TestSmaller(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -584,6 +584,6 @@ func TestSpaceship(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

40
node/expr/cast/t_cast_test.go
View File

@ -40,10 +40,10 @@ func TestArray(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -60,10 +60,10 @@ func TestBool(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -80,10 +80,10 @@ func TestBoolShort(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -100,10 +100,10 @@ func TestDouble(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -120,10 +120,10 @@ func TestCastFloat(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -140,10 +140,10 @@ func TestInt(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -160,10 +160,10 @@ func TestIntShort(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -180,10 +180,10 @@ func TestObject(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -200,10 +200,10 @@ func TestString(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -220,9 +220,9 @@ func TestUnset(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

8
node/expr/t_array_dim_fetch_test.go
View File

@ -42,10 +42,10 @@ func TestArrayDimFetch(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -66,9 +66,9 @@ func TestArrayDimFetchNested(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

12
node/expr/t_array_test.go
View File

@ -27,10 +27,10 @@ func TestArray(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -52,10 +52,10 @@ func TestArrayItem(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -82,9 +82,9 @@ func TestArrayItems(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

4
node/expr/t_bitwise_not_test.go
View File

@ -25,9 +25,9 @@ func TestBitwiseNot(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

4
node/expr/t_boolean_not_test.go
View File

@ -25,9 +25,9 @@ func TestBooleanNot(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

8
node/expr/t_class_const_fetch_test.go
View File

@ -32,10 +32,10 @@ func TestClassConstFetch(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -53,9 +53,9 @@ func TestStaticClassConstFetch(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

8
node/expr/t_clone_test.go
View File

@ -25,10 +25,10 @@ func TestCloneBrackets(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -45,9 +45,9 @@ func TestClone(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

14
node/expr/t_closure_test.go
View File

@ -31,10 +31,10 @@ func TestClosure(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -76,10 +76,10 @@ func TestClosureUse(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -121,10 +121,10 @@ func TestClosureUse2(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -148,6 +148,6 @@ func TestClosureReturnType(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

12
node/expr/t_const_fetch_test.go
View File

@ -27,10 +27,10 @@ func TestConstFetch(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -47,10 +47,10 @@ func TestConstFetchRelative(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -67,9 +67,9 @@ func TestConstFetchFullyQualified(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

4
node/expr/t_empty_test.go
View File

@ -25,9 +25,9 @@ func TestEmpty(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

4
node/expr/t_error_supress_test.go
View File

@ -25,9 +25,9 @@ func TestErrorSuppress(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

4
node/expr/t_eval_test.go
View File

@ -25,9 +25,9 @@ func TestEval(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

16
node/expr/t_exit_test.go
View File

@ -23,10 +23,10 @@ func TestExit(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -43,10 +43,10 @@ func TestExitExpr(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -61,10 +61,10 @@ func TestDie(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -81,9 +81,9 @@ func TestDieExpr(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

20
node/expr/t_function_call_test.go
View File

@ -35,10 +35,10 @@ func TestFunctionCall(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -60,10 +60,10 @@ func TestFunctionCallRelative(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -93,10 +93,10 @@ func TestFunctionFullyQualified(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -122,10 +122,10 @@ func TestFunctionCallVar(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -156,9 +156,9 @@ func TestFunctionCallExprArg(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

16
node/expr/t_inc_dec_test.go
View File

@ -25,10 +25,10 @@ func TestPostDec(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -45,10 +45,10 @@ func TestPostInc(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -65,10 +65,10 @@ func TestPreDec(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -85,9 +85,9 @@ func TestPreInc(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

16
node/expr/t_include_test.go
View File

@ -25,10 +25,10 @@ func TestInclude(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -45,10 +45,10 @@ func TestIncludeOnce(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -65,10 +65,10 @@ func TestRequire(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -85,9 +85,9 @@ func TestRequireOnce(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

12
node/expr/t_instance_of_test.go
View File

@ -32,10 +32,10 @@ func TestInstanceOf(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -57,10 +57,10 @@ func TestInstanceOfRelative(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -82,9 +82,9 @@ func TestInstanceOfFullyQualified(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

8
node/expr/t_isset_test.go
View File

@ -27,10 +27,10 @@ func TestIsset(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -50,9 +50,9 @@ func TestIssetVariables(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

16
node/expr/t_list_test.go
View File

@ -30,10 +30,10 @@ func TestEmptyList(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -58,10 +58,10 @@ func TestList(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -88,10 +88,10 @@ func TestListArrayIndex(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -123,9 +123,9 @@ func TestListList(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

4
node/expr/t_method_call_test.go
View File

@ -27,9 +27,9 @@ func TestMethodCall(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

14
node/expr/t_new_test.go
View File

@ -31,10 +31,10 @@ func TestNew(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -56,10 +56,10 @@ func TestNewRelative(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -81,10 +81,10 @@ func TestNewFullyQualified(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -108,6 +108,6 @@ func TestNewAnonymous(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

4
node/expr/t_print_test.go
View File

@ -25,9 +25,9 @@ func TestPrint(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

4
node/expr/t_property_fetch_test.go
View File

@ -26,9 +26,9 @@ func TestPropertyFetch(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

4
node/expr/t_shell_exec_test.go
View File

@ -30,9 +30,9 @@ func TestShellExec(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

12
node/expr/t_short_array_test.go
View File

@ -27,10 +27,10 @@ func TestShortArray(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -52,10 +52,10 @@ func TestShortArrayItem(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -82,9 +82,9 @@ func TestShortArrayItems(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

6
node/expr/t_short_list_test.go
View File

@ -34,7 +34,7 @@ func TestShortList(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -61,7 +61,7 @@ func TestShortListArrayIndex(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -93,6 +93,6 @@ func TestShortListList(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

20
node/expr/t_static_call_test.go
View File

@ -33,10 +33,10 @@ func TestStaticCall(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -59,10 +59,10 @@ func TestStaticCallRelative(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -85,10 +85,10 @@ func TestStaticCallFullyQualified(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -111,10 +111,10 @@ func TestStaticCallVar(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -133,9 +133,9 @@ func TestStaticCallVarVar(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

12
node/expr/t_static_property_fetch_test.go
View File

@ -31,10 +31,10 @@ func TestStaticPropertyFetch(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -56,10 +56,10 @@ func TestStaticPropertyFetchRelative(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -81,9 +81,9 @@ func TestStaticPropertyFetchFullyQualified(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

16
node/expr/t_ternary_test.go
View File

@ -27,10 +27,10 @@ func TestTernary(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -48,10 +48,10 @@ func TestTernarySimple(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -74,10 +74,10 @@ func TestTernaryNestedTrue(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -100,9 +100,9 @@ func TestTernaryNestedCond(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

8
node/expr/t_unary_test.go
View File

@ -25,10 +25,10 @@ func TestUnaryMinus(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -45,9 +45,9 @@ func TestUnaryPlus(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

8
node/expr/t_variable_test.go
View File

@ -23,10 +23,10 @@ func TestVariable(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -41,9 +41,9 @@ func TestVariableVariable(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

22
node/expr/t_yield_test.go
View File

@ -24,10 +24,10 @@ func TestYield(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -44,10 +44,10 @@ func TestYieldVal(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -65,10 +65,10 @@ func TestYieldKeyVal(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -85,10 +85,10 @@ func TestYieldExpr(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -106,10 +106,10 @@ func TestYieldKeyExpr(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -126,6 +126,6 @@ func TestYieldFrom(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

12
node/name/t_name_test.go
View File

@ -44,10 +44,10 @@ func TestName(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -67,10 +67,10 @@ func TestFullyQualified(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -90,10 +90,10 @@ func TestRelative(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

32
node/scalar/t_encapsed_test.go
View File

@ -29,10 +29,10 @@ func TestSimpleVar(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -52,10 +52,10 @@ func TestSimpleVarOneChar(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -76,10 +76,10 @@ func TestSimpleVarEndsEcapsed(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -100,10 +100,10 @@ func TestStringVarCurveOpen(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -127,10 +127,10 @@ func TestSimpleVarPropertyFetch(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -150,10 +150,10 @@ func TestDollarOpenCurlyBraces(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -176,10 +176,10 @@ func TestDollarOpenCurlyBracesDimNumber(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -203,9 +203,9 @@ func TestCurlyOpenMethodCall(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

22
node/scalar/t_heredoc_test.go
View File

@ -9,8 +9,8 @@ import (
"github.com/z7zmey/php-parser/node"
"github.com/z7zmey/php-parser/node/scalar"
"github.com/z7zmey/php-parser/node/stmt"
"github.com/z7zmey/php-parser/php7"
"github.com/z7zmey/php-parser/php5"
"github.com/z7zmey/php-parser/php7"
)
func TestHeredocSimpleLabel(t *testing.T) {
@ -34,10 +34,10 @@ LBL;
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -62,10 +62,10 @@ LBL;
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -88,10 +88,10 @@ LBL;
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -110,10 +110,10 @@ CAD;
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -136,9 +136,9 @@ CAD;
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

4
node/scalar/t_magic_constant_test.go
View File

@ -23,9 +23,9 @@ func TestMagicConstant(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

28
node/scalar/t_numbers_test.go
View File

@ -37,10 +37,10 @@ func TestLNumber(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -55,10 +55,10 @@ func TestDNumber(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -73,10 +73,10 @@ func TestFloat(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -91,10 +91,10 @@ func TestBinaryLNumber(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -109,10 +109,10 @@ func TestBinaryDNumber(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -127,10 +127,10 @@ func TestHLNumber(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -145,9 +145,9 @@ func TestHDNumber(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

22
node/scalar/t_string_test.go
View File

@ -22,10 +22,10 @@ func TestDoubleQuotedScalarString(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
func TestDoubleQuotedScalarStringWithEscapedVar(t *testing.T) {
@ -39,10 +39,10 @@ func TestDoubleQuotedScalarStringWithEscapedVar(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -59,10 +59,10 @@ func TestMultilineDoubleQuotedScalarString(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -77,10 +77,10 @@ func TestSingleQuotedScalarString(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -97,9 +97,9 @@ func TestMultilineSingleQuotedScalarString(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
}

16
node/stmt/t_alt_if_test.go
View File

@ -42,10 +42,10 @@ func TestAltIf(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -71,10 +71,10 @@ func TestAltElseIf(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -97,10 +97,10 @@ func TestAltElse(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -135,9 +135,9 @@ func TestAltElseElseIf(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

6
node/stmt/t_class_const_list_test.go
View File

@ -42,7 +42,7 @@ func TestClassConstList(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -73,9 +73,9 @@ func TestClassConstListWithoutModifiers(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

18
node/stmt/t_class_method_test.go
View File

@ -29,10 +29,10 @@ func TestSimpleClassMethod(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -68,10 +68,10 @@ func TestPrivateProtectedClassMethod(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -98,7 +98,7 @@ func TestPhp5ClassMethod(t *testing.T) {
},
}
actual, _, _ := php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -130,7 +130,7 @@ func TestPhp7ClassMethod(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -157,10 +157,10 @@ func TestAbstractClassMethod(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -191,6 +191,6 @@ func TestPhp7AbstractClassMethod(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

22
node/stmt/t_class_test.go
View File

@ -24,10 +24,10 @@ func TestSimpleClass(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -46,10 +46,10 @@ func TestAbstractClass(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -73,10 +73,10 @@ func TestClassExtends(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -102,10 +102,10 @@ func TestClassImplement(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -136,10 +136,10 @@ func TestClassImplements(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -176,6 +176,6 @@ func TestAnonimousClass(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

4
node/stmt/t_const_list_test.go
View File

@ -34,9 +34,9 @@ func TestConstList(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

12
node/stmt/t_continue_test.go
View File

@ -28,10 +28,10 @@ func TestContinueEmpty(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -53,10 +53,10 @@ func TestContinueLight(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -78,9 +78,9 @@ func TestContinue(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

12
node/stmt/t_declare_test.go
View File

@ -30,10 +30,10 @@ func TestDeclare(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -62,10 +62,10 @@ func TestDeclareStmts(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -89,9 +89,9 @@ func TestAltDeclare(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

4
node/stmt/t_do_test.go
View File

@ -26,9 +26,9 @@ func TestDo(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

8
node/stmt/t_echo_test.go
View File

@ -30,10 +30,10 @@ func TestSimpleEcho(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -52,9 +52,9 @@ func TestEcho(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

4
node/stmt/t_expression_test.go
View File

@ -23,9 +23,9 @@ func TestExpression(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

8
node/stmt/t_for_test.go
View File

@ -48,10 +48,10 @@ func TestFor(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -77,9 +77,9 @@ func TestAltFor(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

28
node/stmt/t_foreach_test.go
View File

@ -25,10 +25,10 @@ func TestForeach(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -45,10 +45,10 @@ func TestForeachExpr(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -65,10 +65,10 @@ func TestAltForeach(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -86,10 +86,10 @@ func TestForeachWithKey(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -107,10 +107,10 @@ func TestForeachExprWithKey(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -129,10 +129,10 @@ func TestForeachWithRef(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -158,9 +158,9 @@ func TestForeachWithList(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

18
node/stmt/t_function_test.go
View File

@ -28,10 +28,10 @@ func TestSimpleFunction(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -51,10 +51,10 @@ func TestFunctionReturn(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -90,10 +90,10 @@ func TestFunctionReturnVar(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -115,10 +115,10 @@ func TestRefFunction(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -141,6 +141,6 @@ func TestReturnTypeFunction(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

8
node/stmt/t_global_test.go
View File

@ -25,10 +25,10 @@ func TestGlobal(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -57,9 +57,9 @@ func TestGlobalVars(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

4
node/stmt/t_goto_label_test.go
View File

@ -24,9 +24,9 @@ func TestGotoLabel(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

4
node/stmt/t_halt_compiler_test.go
View File

@ -19,9 +19,9 @@ func TestHaltCompiler(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

20
node/stmt/t_if_test.go
View File

@ -24,10 +24,10 @@ func TestIf(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -50,10 +50,10 @@ func TestElseIf(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -72,10 +72,10 @@ func TestElse(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -104,10 +104,10 @@ func TestElseElseIf(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -138,9 +138,9 @@ func TestElseIfElseIfElse(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

4
node/stmt/t_inline_html_test.go
View File

@ -20,9 +20,9 @@ func TestInlineHtml(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

12
node/stmt/t_interface_test.go
View File

@ -24,10 +24,10 @@ func TestInterface(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -51,10 +51,10 @@ func TestInterfaceExtend(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -83,9 +83,9 @@ func TestInterfaceExtends(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

12
node/stmt/t_namespace_test.go
View File

@ -26,10 +26,10 @@ func TestNamespace(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -49,10 +49,10 @@ func TestNamespaceStmts(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -67,9 +67,9 @@ func TestAnonymousNamespace(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

12
node/stmt/t_property_list_test.go
View File

@ -36,10 +36,10 @@ func TestProperty(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -73,10 +73,10 @@ func TestProperties(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -110,9 +110,9 @@ func TestProperties2(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

12
node/stmt/t_static_var_test.go
View File

@ -27,10 +27,10 @@ func TestStaticVar(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -53,10 +53,10 @@ func TestStaticVars(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -79,9 +79,9 @@ func TestStaticVars2(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

16
node/stmt/t_switch_case_default_test.go
View File

@ -42,10 +42,10 @@ func TestAltSwitch(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -75,10 +75,10 @@ func TestAltSwitchSemicolon(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -112,10 +112,10 @@ func TestSwitch(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -149,9 +149,9 @@ func TestSwitchSemicolon(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

4
node/stmt/t_throw_test.go
View File

@ -22,9 +22,9 @@ func TestThrow(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

4
node/stmt/t_trait_test.go
View File

@ -23,9 +23,9 @@ func TestTrait(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

24
node/stmt/t_trait_use_test.go
View File

@ -34,10 +34,10 @@ func TestTraitUse(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -69,10 +69,10 @@ func TestTraitsUse(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -104,10 +104,10 @@ func TestTraitsUseEmptyAdaptations(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -147,10 +147,10 @@ func TestTraitsUseModifier(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -191,10 +191,10 @@ func TestTraitsUseAliasModifier(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -261,9 +261,9 @@ func TestTraitsUseAdaptions(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

22
node/stmt/t_try_catch_finnaly_test.go
View File

@ -26,10 +26,10 @@ func TestTry(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -61,10 +61,10 @@ func TestTryCatch(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -101,7 +101,7 @@ func TestPhp7TryCatch(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -146,10 +146,10 @@ func TestTryCatchCatch(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -184,10 +184,10 @@ func TestTryCatchFinally(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -243,9 +243,9 @@ func TestTryCatchCatchCatch(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

10
node/stmt/t_unset_test.go
View File

@ -24,10 +24,10 @@ func TestUnset(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -45,10 +45,10 @@ func TestUnsetVars(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -66,6 +66,6 @@ func TestUnsetTrailingComma(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

46
node/stmt/t_use_test.go
View File

@ -30,10 +30,10 @@ func TestSimpleUse(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -56,10 +56,10 @@ func TestUseFullyQualified(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -83,10 +83,10 @@ func TestUseFullyQualifiedAlias(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -116,10 +116,10 @@ func TestUseList(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -150,10 +150,10 @@ func TestUseListAlias(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -184,10 +184,10 @@ func TestUseListFunctionType(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -220,10 +220,10 @@ func TestUseListFunctionTypeAliases(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -254,10 +254,10 @@ func TestUseListConstType(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -290,10 +290,10 @@ func TestUseListConstTypeAliases(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -328,7 +328,7 @@ func TestGroupUse(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -364,7 +364,7 @@ func TestGroupUseAlias(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -400,7 +400,7 @@ func TestFunctionGroupUse(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -436,7 +436,7 @@ func TestConstGroupUse(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -473,6 +473,6 @@ func TestMixedGroupUse(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

12
node/stmt/t_while_break_test.go
View File

@ -28,10 +28,10 @@ func TestBreakEmpty(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -53,10 +53,10 @@ func TestBreakLight(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -78,9 +78,9 @@ func TestBreak(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

16
node/t_node_test.go
View File

@ -42,10 +42,10 @@ func TestIdentifier(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -135,7 +135,7 @@ func TestPhp7ArgumentNode(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -211,7 +211,7 @@ func TestPhp5ArgumentNode(t *testing.T) {
},
}
actual, _, _ := php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -277,7 +277,7 @@ func TestPhp7ParameterNode(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -343,7 +343,7 @@ func TestPhp5ParameterNode(t *testing.T) {
},
}
actual, _, _ := php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -354,9 +354,9 @@ func TestCommentEndFile(t *testing.T) {
Stmts: []node.Node{},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

6
php5/php5_test.go
View File

@ -3615,7 +3615,7 @@ func TestPhp5(t *testing.T) {
},
}
actual, _, _ := php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -3652,7 +3652,7 @@ func TestPhp5Strings(t *testing.T) {
},
}
actual, _, _ := php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -3718,6 +3718,6 @@ CAD;
},
}
actual, _, _ := php5.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php5.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

6
php7/php7_test.go
View File

@ -3166,7 +3166,7 @@ func TestPhp7(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -3203,7 +3203,7 @@ func TestPhp5Strings(t *testing.T) {
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}
@ -3269,6 +3269,6 @@ CAD;
},
}
actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
actual, _, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual)
}

2
visitor/dumper_test.go
View File

@ -22,7 +22,7 @@ func ExampleDumper() {
}
}`
nodes, comments, positions := php7.Parse(bytes.NewBufferString(src), "test.php")
nodes, comments, positions, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
nsResolver := visitor.NewNamespaceResolver()
nodes.Walk(nsResolver)