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

trim $ from variable name identifier

Browse Source
This commit is contained in:
z7zmey
2018-03-18 16:50:19 +02:00
parent 7e6f7e7267
commit 643027db9a
58 changed files with 1107 additions and 1107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
node/stmt/t_alt_if_test.go
View File

@@ -36,7 +36,7 @@ func TestAltIf(t *testing.T) {
expected := &stmt.StmtList{
Stmts: []node.Node{
&stmt.AltIf{
Cond: &expr.Variable{VarName: &node.Identifier{Value: "$a"}},
Cond: &expr.Variable{VarName: &node.Identifier{Value: "a"}},
Stmt: &stmt.StmtList{Stmts: []node.Node{}},
},
},
@@ -59,11 +59,11 @@ func TestAltElseIf(t *testing.T) {
expected := &stmt.StmtList{
Stmts: []node.Node{
&stmt.AltIf{
Cond: &expr.Variable{VarName: &node.Identifier{Value: "$a"}},
Cond: &expr.Variable{VarName: &node.Identifier{Value: "a"}},
Stmt: &stmt.StmtList{Stmts: []node.Node{}},
ElseIf: []node.Node{
&stmt.AltElseIf{
Cond: &expr.Variable{VarName: &node.Identifier{Value: "$b"}},
Cond: &expr.Variable{VarName: &node.Identifier{Value: "b"}},
Stmt: &stmt.StmtList{Stmts: []node.Node{}},
},
},
@@ -88,7 +88,7 @@ func TestAltElse(t *testing.T) {
expected := &stmt.StmtList{
Stmts: []node.Node{
&stmt.AltIf{
Cond: &expr.Variable{VarName: &node.Identifier{Value: "$a"}},
Cond: &expr.Variable{VarName: &node.Identifier{Value: "a"}},
Stmt: &stmt.StmtList{Stmts: []node.Node{}},
Else: &stmt.AltElse{
Stmt: &stmt.StmtList{Stmts: []node.Node{}},
@@ -116,15 +116,15 @@ func TestAltElseElseIf(t *testing.T) {
expected := &stmt.StmtList{
Stmts: []node.Node{
&stmt.AltIf{
Cond: &expr.Variable{VarName: &node.Identifier{Value: "$a"}},
Cond: &expr.Variable{VarName: &node.Identifier{Value: "a"}},
Stmt: &stmt.StmtList{Stmts: []node.Node{}},
ElseIf: []node.Node{
&stmt.AltElseIf{
Cond: &expr.Variable{VarName: &node.Identifier{Value: "$b"}},
Cond: &expr.Variable{VarName: &node.Identifier{Value: "b"}},
Stmt: &stmt.StmtList{Stmts: []node.Node{}},
},
&stmt.AltElseIf{
Cond: &expr.Variable{VarName: &node.Identifier{Value: "$c"}},
Cond: &expr.Variable{VarName: &node.Identifier{Value: "c"}},
Stmt: &stmt.StmtList{Stmts: []node.Node{}},
},
},

4
node/stmt/t_echo_test.go
View File

@@ -22,7 +22,7 @@ func TestSimpleEcho(t *testing.T) {
&stmt.Echo{
Exprs: []node.Node{
&expr.Variable{
VarName: &node.Identifier{Value: "$a"},
VarName: &node.Identifier{Value: "a"},
},
&scalar.Lnumber{Value: "1"},
},
@@ -45,7 +45,7 @@ func TestEcho(t *testing.T) {
&stmt.Echo{
Exprs: []node.Node{
&expr.Variable{
VarName: &node.Identifier{Value: "$a"},
VarName: &node.Identifier{Value: "a"},
},
},
},

12
node/stmt/t_for_test.go
View File

@@ -25,22 +25,22 @@ func TestFor(t *testing.T) {
&stmt.For{
Init: []node.Node{
&assign.Assign{
Variable: &expr.Variable{VarName: &node.Identifier{Value: "$i"}},
Variable: &expr.Variable{VarName: &node.Identifier{Value: "i"}},
Expression: &scalar.Lnumber{Value: "0"},
},
},
Cond: []node.Node{
&binary.Smaller{
Left: &expr.Variable{VarName: &node.Identifier{Value: "$i"}},
Left: &expr.Variable{VarName: &node.Identifier{Value: "i"}},
Right: &scalar.Lnumber{Value: "10"},
},
},
Loop: []node.Node{
&expr.PostInc{
Variable: &expr.Variable{VarName: &node.Identifier{Value: "$i"}},
Variable: &expr.Variable{VarName: &node.Identifier{Value: "i"}},
},
&expr.PostInc{
Variable: &expr.Variable{VarName: &node.Identifier{Value: "$i"}},
Variable: &expr.Variable{VarName: &node.Identifier{Value: "i"}},
},
},
Stmt: &stmt.StmtList{Stmts: []node.Node{}},
@@ -63,13 +63,13 @@ func TestAltFor(t *testing.T) {
&stmt.AltFor{
Cond: []node.Node{
&binary.Smaller{
Left: &expr.Variable{VarName: &node.Identifier{Value: "$i"}},
Left: &expr.Variable{VarName: &node.Identifier{Value: "i"}},
Right: &scalar.Lnumber{Value: "10"},
},
},
Loop: []node.Node{
&expr.PostInc{
Variable: &expr.Variable{VarName: &node.Identifier{Value: "$i"}},
Variable: &expr.Variable{VarName: &node.Identifier{Value: "i"}},
},
},
Stmt: &stmt.StmtList{Stmts: []node.Node{}},

32
node/stmt/t_foreach_test.go
View File

@@ -18,8 +18,8 @@ func TestForeach(t *testing.T) {
expected := &stmt.StmtList{
Stmts: []node.Node{
&stmt.Foreach{
Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}},
Variable: &expr.Variable{VarName: &node.Identifier{Value: "$v"}},
Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}},
Variable: &expr.Variable{VarName: &node.Identifier{Value: "v"}},
Stmt: &stmt.StmtList{Stmts: []node.Node{}},
},
},
@@ -39,7 +39,7 @@ func TestForeachExpr(t *testing.T) {
Stmts: []node.Node{
&stmt.Foreach{
Expr: &expr.ShortArray{Items: []node.Node{}},
Variable: &expr.Variable{VarName: &node.Identifier{Value: "$v"}},
Variable: &expr.Variable{VarName: &node.Identifier{Value: "v"}},
Stmt: &stmt.StmtList{Stmts: []node.Node{}},
},
},
@@ -58,8 +58,8 @@ func TestAltForeach(t *testing.T) {
expected := &stmt.StmtList{
Stmts: []node.Node{
&stmt.AltForeach{
Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}},
Variable: &expr.Variable{VarName: &node.Identifier{Value: "$v"}},
Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}},
Variable: &expr.Variable{VarName: &node.Identifier{Value: "v"}},
Stmt: &stmt.StmtList{Stmts: []node.Node{}},
},
},
@@ -78,9 +78,9 @@ func TestForeachWithKey(t *testing.T) {
expected := &stmt.StmtList{
Stmts: []node.Node{
&stmt.Foreach{
Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}},
Key: &expr.Variable{VarName: &node.Identifier{Value: "$k"}},
Variable: &expr.Variable{VarName: &node.Identifier{Value: "$v"}},
Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}},
Key: &expr.Variable{VarName: &node.Identifier{Value: "k"}},
Variable: &expr.Variable{VarName: &node.Identifier{Value: "v"}},
Stmt: &stmt.StmtList{Stmts: []node.Node{}},
},
},
@@ -100,8 +100,8 @@ func TestForeachExprWithKey(t *testing.T) {
Stmts: []node.Node{
&stmt.Foreach{
Expr: &expr.ShortArray{Items: []node.Node{}},
Key: &expr.Variable{VarName: &node.Identifier{Value: "$k"}},
Variable: &expr.Variable{VarName: &node.Identifier{Value: "$v"}},
Key: &expr.Variable{VarName: &node.Identifier{Value: "k"}},
Variable: &expr.Variable{VarName: &node.Identifier{Value: "v"}},
Stmt: &stmt.StmtList{Stmts: []node.Node{}},
},
},
@@ -121,9 +121,9 @@ func TestForeachWithRef(t *testing.T) {
Stmts: []node.Node{
&stmt.Foreach{
ByRef: true,
Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}},
Key: &expr.Variable{VarName: &node.Identifier{Value: "$k"}},
Variable: &expr.Variable{VarName: &node.Identifier{Value: "$v"}},
Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}},
Key: &expr.Variable{VarName: &node.Identifier{Value: "k"}},
Variable: &expr.Variable{VarName: &node.Identifier{Value: "v"}},
Stmt: &stmt.StmtList{Stmts: []node.Node{}},
},
},
@@ -143,13 +143,13 @@ func TestForeachWithList(t *testing.T) {
Stmts: []node.Node{
&stmt.Foreach{
ByRef: false,
Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}},
Key: &expr.Variable{VarName: &node.Identifier{Value: "$k"}},
Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}},
Key: &expr.Variable{VarName: &node.Identifier{Value: "k"}},
Variable: &expr.List{
Items: []node.Node{
&expr.ArrayItem{
ByRef: false,
Val: &expr.Variable{VarName: &node.Identifier{Value: "$v"}},
Val: &expr.Variable{VarName: &node.Identifier{Value: "v"}},
},
},
},

6
node/stmt/t_function_test.go
View File

@@ -72,18 +72,18 @@ func TestFunctionReturnVar(t *testing.T) {
ByRef: false,
Variadic: false,
VariableType: &node.Identifier{Value: "array"},
Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}},
Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}},
},
&node.Parameter{
ByRef: false,
Variadic: false,
VariableType: &node.Identifier{Value: "callable"},
Variable: &expr.Variable{VarName: &node.Identifier{Value: "$b"}},
Variable: &expr.Variable{VarName: &node.Identifier{Value: "b"}},
},
},
Stmts: []node.Node{
&stmt.Return{
Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}},
Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}},
},
},
},

8
node/stmt/t_global_test.go
View File

@@ -19,7 +19,7 @@ func TestGlobal(t *testing.T) {
Stmts: []node.Node{
&stmt.Global{
Vars: []node.Node{
&expr.Variable{VarName: &node.Identifier{Value: "$a"}},
&expr.Variable{VarName: &node.Identifier{Value: "a"}},
},
},
},
@@ -39,9 +39,9 @@ func TestGlobalVars(t *testing.T) {
Stmts: []node.Node{
&stmt.Global{
Vars: []node.Node{
&expr.Variable{VarName: &node.Identifier{Value: "$a"}},
&expr.Variable{VarName: &node.Identifier{Value: "$b"}},
&expr.Variable{VarName: &expr.Variable{VarName: &node.Identifier{Value: "$c"}}},
&expr.Variable{VarName: &node.Identifier{Value: "a"}},
&expr.Variable{VarName: &node.Identifier{Value: "b"}},
&expr.Variable{VarName: &expr.Variable{VarName: &node.Identifier{Value: "c"}}},
&expr.Variable{
VarName: &expr.FunctionCall{
Function: &name.Name{

20
node/stmt/t_if_test.go
View File

@@ -18,7 +18,7 @@ func TestIf(t *testing.T) {
expected := &stmt.StmtList{
Stmts: []node.Node{
&stmt.If{
Cond: &expr.Variable{VarName: &node.Identifier{Value: "$a"}},
Cond: &expr.Variable{VarName: &node.Identifier{Value: "a"}},
Stmt: &stmt.StmtList{Stmts: []node.Node{}},
},
},
@@ -38,11 +38,11 @@ func TestElseIf(t *testing.T) {
expected := &stmt.StmtList{
Stmts: []node.Node{
&stmt.If{
Cond: &expr.Variable{VarName: &node.Identifier{Value: "$a"}},
Cond: &expr.Variable{VarName: &node.Identifier{Value: "a"}},
Stmt: &stmt.StmtList{Stmts: []node.Node{}},
ElseIf: []node.Node{
&stmt.ElseIf{
Cond: &expr.Variable{VarName: &node.Identifier{Value: "$b"}},
Cond: &expr.Variable{VarName: &node.Identifier{Value: "b"}},
Stmt: &stmt.StmtList{Stmts: []node.Node{}},
},
},
@@ -63,7 +63,7 @@ func TestElse(t *testing.T) {
expected := &stmt.StmtList{
Stmts: []node.Node{
&stmt.If{
Cond: &expr.Variable{VarName: &node.Identifier{Value: "$a"}},
Cond: &expr.Variable{VarName: &node.Identifier{Value: "a"}},
Stmt: &stmt.StmtList{Stmts: []node.Node{}},
Else: &stmt.Else{
Stmt: &stmt.StmtList{Stmts: []node.Node{}},
@@ -85,15 +85,15 @@ func TestElseElseIf(t *testing.T) {
expected := &stmt.StmtList{
Stmts: []node.Node{
&stmt.If{
Cond: &expr.Variable{VarName: &node.Identifier{Value: "$a"}},
Cond: &expr.Variable{VarName: &node.Identifier{Value: "a"}},
Stmt: &stmt.StmtList{Stmts: []node.Node{}},
ElseIf: []node.Node{
&stmt.ElseIf{
Cond: &expr.Variable{VarName: &node.Identifier{Value: "$b"}},
Cond: &expr.Variable{VarName: &node.Identifier{Value: "b"}},
Stmt: &stmt.StmtList{Stmts: []node.Node{}},
},
&stmt.ElseIf{
Cond: &expr.Variable{VarName: &node.Identifier{Value: "$c"}},
Cond: &expr.Variable{VarName: &node.Identifier{Value: "c"}},
Stmt: &stmt.StmtList{Stmts: []node.Node{}},
},
},
@@ -117,17 +117,17 @@ func TestElseIfElseIfElse(t *testing.T) {
expected := &stmt.StmtList{
Stmts: []node.Node{
&stmt.If{
Cond: &expr.Variable{VarName: &node.Identifier{Value: "$a"}},
Cond: &expr.Variable{VarName: &node.Identifier{Value: "a"}},
Stmt: &stmt.StmtList{Stmts: []node.Node{}},
ElseIf: []node.Node{
&stmt.ElseIf{
Cond: &expr.Variable{VarName: &node.Identifier{Value: "$b"}},
Cond: &expr.Variable{VarName: &node.Identifier{Value: "b"}},
Stmt: &stmt.StmtList{Stmts: []node.Node{}},
},
},
Else: &stmt.Else{
Stmt: &stmt.If{
Cond: &expr.Variable{VarName: &node.Identifier{Value: "$c"}},
Cond: &expr.Variable{VarName: &node.Identifier{Value: "c"}},
Stmt: &stmt.StmtList{Stmts: []node.Node{}},
Else: &stmt.Else{
Stmt: &stmt.StmtList{Stmts: []node.Node{}},

10
node/stmt/t_property_list_test.go
View File

@@ -27,7 +27,7 @@ func TestProperty(t *testing.T) {
Properties: []node.Node{
&stmt.Property{
PhpDocComment: "",
Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}},
Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}},
},
},
},
@@ -59,11 +59,11 @@ func TestProperties(t *testing.T) {
Properties: []node.Node{
&stmt.Property{
PhpDocComment: "",
Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}},
Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}},
},
&stmt.Property{
PhpDocComment: "",
Variable: &expr.Variable{VarName: &node.Identifier{Value: "$b"}},
Variable: &expr.Variable{VarName: &node.Identifier{Value: "b"}},
Expr: &scalar.Lnumber{Value: "1"},
},
},
@@ -96,12 +96,12 @@ func TestProperties2(t *testing.T) {
Properties: []node.Node{
&stmt.Property{
PhpDocComment: "",
Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}},
Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}},
Expr: &scalar.Lnumber{Value: "1"},
},
&stmt.Property{
PhpDocComment: "",
Variable: &expr.Variable{VarName: &node.Identifier{Value: "$b"}},
Variable: &expr.Variable{VarName: &node.Identifier{Value: "b"}},
},
},
},

10
node/stmt/t_static_var_test.go
View File

@@ -20,7 +20,7 @@ func TestStaticVar(t *testing.T) {
&stmt.Static{
Vars: []node.Node{
&stmt.StaticVar{
Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}},
Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}},
},
},
},
@@ -42,10 +42,10 @@ func TestStaticVars(t *testing.T) {
&stmt.Static{
Vars: []node.Node{
&stmt.StaticVar{
Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}},
Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}},
},
&stmt.StaticVar{
Variable: &expr.Variable{VarName: &node.Identifier{Value: "$b"}},
Variable: &expr.Variable{VarName: &node.Identifier{Value: "b"}},
Expr: &scalar.Lnumber{Value: "1"},
},
},
@@ -68,11 +68,11 @@ func TestStaticVars2(t *testing.T) {
&stmt.Static{
Vars: []node.Node{
&stmt.StaticVar{
Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}},
Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}},
Expr: &scalar.Lnumber{Value: "1"},
},
&stmt.StaticVar{
Variable: &expr.Variable{VarName: &node.Identifier{Value: "$b"}},
Variable: &expr.Variable{VarName: &node.Identifier{Value: "b"}},
},
},
},

2
node/stmt/t_throw_test.go
View File

@@ -17,7 +17,7 @@ func TestThrow(t *testing.T) {
expected := &stmt.StmtList{
Stmts: []node.Node{
&stmt.Throw{
Expr: &expr.Variable{VarName: &node.Identifier{Value: "$e"}},
Expr: &expr.Variable{VarName: &node.Identifier{Value: "e"}},
},
},
}

16
node/stmt/t_try_catch_finnaly_test.go
View File

@@ -52,7 +52,7 @@ func TestTryCatch(t *testing.T) {
},
},
Variable: &expr.Variable{
VarName: &node.Identifier{Value: "$e"},
VarName: &node.Identifier{Value: "e"},
},
Stmts: []node.Node{},
},
@@ -92,7 +92,7 @@ func TestPhp7TryCatch(t *testing.T) {
},
},
Variable: &expr.Variable{
VarName: &node.Identifier{Value: "$e"},
VarName: &node.Identifier{Value: "e"},
},
Stmts: []node.Node{},
},
@@ -124,7 +124,7 @@ func TestTryCatchCatch(t *testing.T) {
},
},
Variable: &expr.Variable{
VarName: &node.Identifier{Value: "$e"},
VarName: &node.Identifier{Value: "e"},
},
Stmts: []node.Node{},
},
@@ -137,7 +137,7 @@ func TestTryCatchCatch(t *testing.T) {
},
},
Variable: &expr.Variable{
VarName: &node.Identifier{Value: "$e"},
VarName: &node.Identifier{Value: "e"},
},
Stmts: []node.Node{},
},
@@ -172,7 +172,7 @@ func TestTryCatchFinally(t *testing.T) {
},
},
Variable: &expr.Variable{
VarName: &node.Identifier{Value: "$e"},
VarName: &node.Identifier{Value: "e"},
},
Stmts: []node.Node{},
},
@@ -208,7 +208,7 @@ func TestTryCatchCatchCatch(t *testing.T) {
},
},
Variable: &expr.Variable{
VarName: &node.Identifier{Value: "$e"},
VarName: &node.Identifier{Value: "e"},
},
Stmts: []node.Node{},
},
@@ -221,7 +221,7 @@ func TestTryCatchCatchCatch(t *testing.T) {
},
},
Variable: &expr.Variable{
VarName: &node.Identifier{Value: "$e"},
VarName: &node.Identifier{Value: "e"},
},
Stmts: []node.Node{},
},
@@ -234,7 +234,7 @@ func TestTryCatchCatchCatch(t *testing.T) {
},
},
Variable: &expr.Variable{
VarName: &node.Identifier{Value: "$e"},
VarName: &node.Identifier{Value: "e"},
},
Stmts: []node.Node{},
},

10
node/stmt/t_unset_test.go
View File

@@ -18,7 +18,7 @@ func TestUnset(t *testing.T) {
Stmts: []node.Node{
&stmt.Unset{
Vars: []node.Node{
&expr.Variable{VarName: &node.Identifier{Value: "$a"}},
&expr.Variable{VarName: &node.Identifier{Value: "a"}},
},
},
},
@@ -38,8 +38,8 @@ func TestUnsetVars(t *testing.T) {
Stmts: []node.Node{
&stmt.Unset{
Vars: []node.Node{
&expr.Variable{VarName: &node.Identifier{Value: "$a"}},
&expr.Variable{VarName: &node.Identifier{Value: "$b"}},
&expr.Variable{VarName: &node.Identifier{Value: "a"}},
&expr.Variable{VarName: &node.Identifier{Value: "b"}},
},
},
},
@@ -59,8 +59,8 @@ func TestUnsetTrailingComma(t *testing.T) {
Stmts: []node.Node{
&stmt.Unset{
Vars: []node.Node{
&expr.Variable{VarName: &node.Identifier{Value: "$a"}},
&expr.Variable{VarName: &node.Identifier{Value: "$b"}},
&expr.Variable{VarName: &node.Identifier{Value: "a"}},
&expr.Variable{VarName: &node.Identifier{Value: "b"}},
},
},
},