From 367eff9de651fb9479c98f4f3741db3195e549ad Mon Sep 17 00:00:00 2001 From: Vadym Slizov Date: Sat, 13 Feb 2021 23:54:34 +0200 Subject: [PATCH] rename package cfg to conf --- cmd/php-parser/main.go | 4 +- internal/php5/parser.go | 4 +- internal/php5/parser_test.go | 424 ++++++++++----------- internal/php5/php5_bench_test.go | 4 +- internal/php7/parser.go | 4 +- internal/php7/parser_test.go | 466 +++++++++++------------ internal/php7/php7_bench_test.go | 4 +- internal/scanner/lexer.go | 4 +- internal/scanner/scanner_test.go | 70 ++-- pkg/{cfg/cfg.go => conf/conf.go} | 2 +- pkg/parser/doc.go | 6 +- pkg/parser/parser.go | 4 +- pkg/visitor/printer/printer_php5_test.go | 4 +- pkg/visitor/printer/printer_php7_test.go | 6 +- 14 files changed, 503 insertions(+), 503 deletions(-) rename pkg/{cfg/cfg.go => conf/conf.go} (93%) diff --git a/cmd/php-parser/main.go b/cmd/php-parser/main.go index 796e87e..f1f4224 100644 --- a/cmd/php-parser/main.go +++ b/cmd/php-parser/main.go @@ -18,7 +18,7 @@ import ( "github.com/yookoala/realpath" "github.com/z7zmey/php-parser/pkg/ast" - "github.com/z7zmey/php-parser/pkg/cfg" + "github.com/z7zmey/php-parser/pkg/conf" "github.com/z7zmey/php-parser/pkg/errors" "github.com/z7zmey/php-parser/pkg/parser" "github.com/z7zmey/php-parser/pkg/version" @@ -138,7 +138,7 @@ func parserWorker(fileCh <-chan *file, r chan<- result) { } var parserErrors []*errors.Error - rootNode, err := parser.Parse(f.content, cfg.Config{ + rootNode, err := parser.Parse(f.content, conf.Config{ Version: phpVersion, ErrorHandlerFunc: func(e *errors.Error) { parserErrors = append(parserErrors, e) diff --git a/internal/php5/parser.go b/internal/php5/parser.go index a8c8dcf..318d873 100644 --- a/internal/php5/parser.go +++ b/internal/php5/parser.go @@ -4,7 +4,7 @@ import ( "github.com/z7zmey/php-parser/internal/position" "github.com/z7zmey/php-parser/internal/scanner" "github.com/z7zmey/php-parser/pkg/ast" - "github.com/z7zmey/php-parser/pkg/cfg" + "github.com/z7zmey/php-parser/pkg/conf" "github.com/z7zmey/php-parser/pkg/errors" "github.com/z7zmey/php-parser/pkg/token" ) @@ -19,7 +19,7 @@ type Parser struct { } // NewParser creates and returns new Parser -func NewParser(lexer *scanner.Lexer, config cfg.Config) *Parser { +func NewParser(lexer *scanner.Lexer, config conf.Config) *Parser { return &Parser{ Lexer: lexer, errHandlerFunc: config.ErrorHandlerFunc, diff --git a/internal/php5/parser_test.go b/internal/php5/parser_test.go index bceac81..b25c2ec 100644 --- a/internal/php5/parser_test.go +++ b/internal/php5/parser_test.go @@ -8,7 +8,7 @@ import ( "github.com/z7zmey/php-parser/internal/php5" "github.com/z7zmey/php-parser/internal/scanner" "github.com/z7zmey/php-parser/pkg/ast" - "github.com/z7zmey/php-parser/pkg/cfg" + "github.com/z7zmey/php-parser/pkg/conf" "github.com/z7zmey/php-parser/pkg/errors" "github.com/z7zmey/php-parser/pkg/position" "github.com/z7zmey/php-parser/pkg/token" @@ -97,7 +97,7 @@ func TestIdentifier(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -1402,7 +1402,7 @@ func TestPhp5ArgumentNode(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -3000,7 +3000,7 @@ func TestPhp5ParameterNode(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -3060,7 +3060,7 @@ func TestCommentEndFile(t *testing.T) { }, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -3187,7 +3187,7 @@ func TestName(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -3322,7 +3322,7 @@ func TestFullyQualified(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -3467,7 +3467,7 @@ func TestRelative(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -3613,7 +3613,7 @@ func TestScalarEncapsed_SimpleVar(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -3757,7 +3757,7 @@ func TestScalarEncapsed_SimpleVarOneChar(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -3920,7 +3920,7 @@ func TestScalarEncapsed_SimpleVarEndsEcapsed(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -4119,7 +4119,7 @@ func TestScalarEncapsed_StringVarCurveOpen(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -4319,7 +4319,7 @@ func TestScalarEncapsed_SimpleVarPropertyFetch(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -4483,7 +4483,7 @@ func TestScalarEncapsed_DollarOpenCurlyBraces(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -4686,7 +4686,7 @@ func TestScalarEncapsed_DollarOpenCurlyBracesDimNumber(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -4915,7 +4915,7 @@ func TestScalarEncapsed_CurlyOpenMethodCall(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -5094,7 +5094,7 @@ LBL; }, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -5273,7 +5273,7 @@ LBL; }, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -5406,7 +5406,7 @@ LBL; }, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -5517,7 +5517,7 @@ CAD; }, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -5650,7 +5650,7 @@ CAD; }, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -5738,7 +5738,7 @@ func TestScalarMagicConstant(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -5825,7 +5825,7 @@ func TestScalarNumber_LNumber(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -5912,7 +5912,7 @@ func TestScalarNumber_DNumber(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -5999,7 +5999,7 @@ func TestScalarNumber_Float(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -6086,7 +6086,7 @@ func TestScalarNumber_BinaryLNumber(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -6173,7 +6173,7 @@ func TestScalarNumber_BinaryDNumber(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -6260,7 +6260,7 @@ func TestScalarNumber_HLNumber(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -6347,7 +6347,7 @@ func TestScalarNumber_HDNumber(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -6434,7 +6434,7 @@ func TestScalarString_DoubleQuotedScalarString(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -6521,7 +6521,7 @@ func TestScalarString_DoubleQuotedScalarStringWithEscapedVar(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -6610,7 +6610,7 @@ func TestScalarString_MultilineDoubleQuotedScalarString(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -6697,7 +6697,7 @@ func TestScalarString_SingleQuotedScalarString(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -6786,7 +6786,7 @@ func TestScalarString_MultilineSingleQuotedScalarString(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -6980,7 +6980,7 @@ func TestStmtAltIf_AltIf(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -7297,7 +7297,7 @@ func TestStmtAltIf_AltElseIf(t *testing.T) { }, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -7553,7 +7553,7 @@ func TestStmtAltIf_AltElse(t *testing.T) { }, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -8029,7 +8029,7 @@ func TestStmtAltIf_AltElseElseIf(t *testing.T) { }, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -8400,7 +8400,7 @@ func TestStmtClassConstList_WithoutModifiers(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -8655,7 +8655,7 @@ func TestStmtClassMethod_SimpleClassMethod(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -9129,7 +9129,7 @@ func TestStmtClassMethod_PrivateProtectedClassMethod(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -9458,7 +9458,7 @@ func TestStmtClassMethod_Php5ClassMethod(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -9787,7 +9787,7 @@ func TestStmtClassMethod_AbstractClassMethod(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -9919,7 +9919,7 @@ func TestStmtClass_SimpleClass(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -10084,7 +10084,7 @@ func TestStmtClass_AbstractClass(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -10324,7 +10324,7 @@ func TestStmtClass_ClassExtends(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -10566,7 +10566,7 @@ func TestStmtClass_ClassImplement(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -10861,7 +10861,7 @@ func TestStmtClass_ClassImplements(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -11137,7 +11137,7 @@ func TestStmtConstList(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -11350,7 +11350,7 @@ func TestStmtContinue_Empty(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -11594,7 +11594,7 @@ func TestStmtContinue_Light(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -11854,7 +11854,7 @@ func TestStmtContinue(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -12018,7 +12018,7 @@ func TestStmtDeclare(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -12285,7 +12285,7 @@ func TestStmtDeclare_Stmts(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -12482,7 +12482,7 @@ func TestStmtDeclare_Alt(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -12662,7 +12662,7 @@ func TestStmtDo(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -12824,7 +12824,7 @@ func TestStmtEcho(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -12959,7 +12959,7 @@ func TestStmtEcho_Parenthesis(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -13102,7 +13102,7 @@ func TestStmtExpression(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -13571,7 +13571,7 @@ func TestStmtFor(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -13903,7 +13903,7 @@ func TestStmtFor_Alt(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -14132,7 +14132,7 @@ func TestStmtForeach(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -14362,7 +14362,7 @@ func TestStmtForeach_Expr(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -14613,7 +14613,7 @@ func TestStmtForeach_Alt(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -14903,7 +14903,7 @@ func TestStmtForeach_WithKey(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -15194,7 +15194,7 @@ func TestStmtForeach_ExprWithKey(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -15494,7 +15494,7 @@ func TestStmtForeach_WithRef(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -15832,7 +15832,7 @@ func TestStmtForeach_WithList(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -15984,7 +15984,7 @@ func TestStmtFunction(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -16165,7 +16165,7 @@ func TestStmtFunction_Return(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -16543,7 +16543,7 @@ func TestStmtFunction_ReturnVar(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -16765,7 +16765,7 @@ func TestStmtFunction_Ref(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -16884,7 +16884,7 @@ func TestStmtGlobal(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -17238,7 +17238,7 @@ func TestStmtGlobal_Vars(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -17396,7 +17396,7 @@ func TestStmtGotoLabel(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -17494,7 +17494,7 @@ func TestStmtHaltCompiler(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -17662,7 +17662,7 @@ func TestStmtIf(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -17962,7 +17962,7 @@ func TestStmtIf_ElseIf(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -18201,7 +18201,7 @@ func TestStmtIf_Else(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -18702,7 +18702,7 @@ func TestStmtIf_ElseElseIf(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -19233,7 +19233,7 @@ func TestStmtIf_ElseIfElseIfElse(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -19320,7 +19320,7 @@ func TestStmtInlineHtml(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -19452,7 +19452,7 @@ func TestStmtInterface(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -19649,7 +19649,7 @@ func TestStmtInterface_Extend(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -19899,7 +19899,7 @@ func TestStmtInterface_Extends(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -20018,7 +20018,7 @@ func TestStmtNamespace(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -20160,7 +20160,7 @@ func TestStmtNamespace_Stmts(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -20261,7 +20261,7 @@ func TestStmtNamespace_Anonymous(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -20482,7 +20482,7 @@ func TestStmtProperty(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -20846,7 +20846,7 @@ func TestStmtProperty_Properties(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -21210,7 +21210,7 @@ func TestStmtProperty_Properties2(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -21337,7 +21337,7 @@ func TestStmtStaticVar(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -21576,7 +21576,7 @@ func TestStmtStaticVar_Vars(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -21815,7 +21815,7 @@ func TestStmtStaticVar_Vars2(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -22210,7 +22210,7 @@ func TestStmtSwitch(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -22615,7 +22615,7 @@ func TestStmtSwitch_Semicolon(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -22980,7 +22980,7 @@ func TestStmtSwitch_Alt(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -23313,7 +23313,7 @@ func TestStmtSwitch_AltSemicolon(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -23430,7 +23430,7 @@ func TestStmtThrow(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -23562,7 +23562,7 @@ func TestStmtTrait(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -23790,7 +23790,7 @@ func TestStmtTraitUse(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -24071,7 +24071,7 @@ func TestStmtTraitUse_Uses(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -24374,7 +24374,7 @@ func TestStmtTraitUse_EmptyAdaptations(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -24793,7 +24793,7 @@ func TestStmtTraitUse_Modifier(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -25243,7 +25243,7 @@ func TestStmtTraitUse_AliasModifier(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -25907,7 +25907,7 @@ func TestStmtTraitUse_Adaptions(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -26010,7 +26010,7 @@ func TestStmtTry_Try(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -26279,7 +26279,7 @@ func TestStmtTry_TryCatch(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -26713,7 +26713,7 @@ func TestStmtTry_TryCatchCatch(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -27045,7 +27045,7 @@ func TestStmtTry_TryCatchFinally(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -27673,7 +27673,7 @@ func TestStmtTry_TryCatchCatchCatch(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -27800,7 +27800,7 @@ func TestStmtUnset(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -27978,7 +27978,7 @@ func TestStmtUnset_Vars(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -28107,7 +28107,7 @@ func TestStmtUse(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -28246,7 +28246,7 @@ func TestStmtUse_FullyQualified(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -28438,7 +28438,7 @@ func TestStmtUse_FullyQualifiedAlias(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -28628,7 +28628,7 @@ func TestStmtUse_List(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -28871,7 +28871,7 @@ func TestStmtUse_ListAlias(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -29102,7 +29102,7 @@ func TestStmtUse_ListFunctionType(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -29439,7 +29439,7 @@ func TestStmtUse_ListFunctionTypeAliases(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -29670,7 +29670,7 @@ func TestStmtUse_ListConstType(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -30007,7 +30007,7 @@ func TestStmtUse_ListConstTypeAliases(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -30220,7 +30220,7 @@ func TestStmtBreak_Empty(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -30464,7 +30464,7 @@ func TestStmtBreak_Light(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -30734,7 +30734,7 @@ func TestStmtBreak(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -30878,7 +30878,7 @@ func TestExprArrayDimFetch(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -31067,7 +31067,7 @@ func TestExprArrayDimFetch_Nested(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -31173,7 +31173,7 @@ func TestExprArray(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -31308,7 +31308,7 @@ func TestExprArray_Item(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -31552,7 +31552,7 @@ func TestExprArray_Items(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -31665,7 +31665,7 @@ func TestExprBitwiseNot(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -31778,7 +31778,7 @@ func TestExprBooleanNot(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -31912,7 +31912,7 @@ func TestExprClassConstFetch(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -32036,7 +32036,7 @@ func TestExprClassConstFetch_Static(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -32177,7 +32177,7 @@ func TestExprClone_Brackets(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -32302,7 +32302,7 @@ func TestExprClone(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -32429,7 +32429,7 @@ func TestExprClosure(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -32824,7 +32824,7 @@ func TestExprClosure_Use(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -33219,7 +33219,7 @@ func TestExprClosure_Use2(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -33324,7 +33324,7 @@ func TestExprConstFetch(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -33449,7 +33449,7 @@ func TestExprConstFetch_Relative(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -33564,7 +33564,7 @@ func TestExprConstFetch_FullyQualified(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -33697,7 +33697,7 @@ func TestExprEmpty(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -33810,7 +33810,7 @@ func TestExprErrorSuppress(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -33943,7 +33943,7 @@ func TestExprEval(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -34029,7 +34029,7 @@ func TestExprExit(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -34135,7 +34135,7 @@ func TestExprExit_Empty(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -34268,7 +34268,7 @@ func TestExprExit_Expr(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -34354,7 +34354,7 @@ func TestExprDie(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -34460,7 +34460,7 @@ func TestExprDie_Empty(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -34593,7 +34593,7 @@ func TestExprDie_Expr(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -34718,7 +34718,7 @@ func TestExprFunctionCall(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -34863,7 +34863,7 @@ func TestExprFunctionCall_Relative(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -35036,7 +35036,7 @@ func TestExprFunctionCall_FullyQualified(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -35226,7 +35226,7 @@ func TestExprFunctionCall_Var(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -35425,7 +35425,7 @@ func TestExprFunctionCall_ExprArg(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -35538,7 +35538,7 @@ func TestExprPostDec(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -35651,7 +35651,7 @@ func TestExprPostInc(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -35764,7 +35764,7 @@ func TestExprPreDec(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -35877,7 +35877,7 @@ func TestExprPreInc(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -36002,7 +36002,7 @@ func TestExprInclude(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -36127,7 +36127,7 @@ func TestExprInclude_Once(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -36252,7 +36252,7 @@ func TestExprRequire(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -36377,7 +36377,7 @@ func TestExprRequire_Once(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -36543,7 +36543,7 @@ func TestExprInstanceOf(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -36729,7 +36729,7 @@ func TestExprInstanceOf_Relative(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -36905,7 +36905,7 @@ func TestExprInstanceOf_FullyQualified(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -37040,7 +37040,7 @@ func TestExprIsset(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -37226,7 +37226,7 @@ func TestExprIsset_Variables(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -37404,7 +37404,7 @@ func TestExprList_Empty(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -37616,7 +37616,7 @@ func TestExprList(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -37856,7 +37856,7 @@ func TestExprList_ArrayIndex(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -38116,7 +38116,7 @@ func TestExprList_List(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -38353,7 +38353,7 @@ func TestExprList_EmptyItem(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -38636,7 +38636,7 @@ func TestExprList_EmptyItems(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -38788,7 +38788,7 @@ func TestExprMethodCall(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -38915,7 +38915,7 @@ func TestExprNew(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -39082,7 +39082,7 @@ func TestExprNew_Relative(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -39239,7 +39239,7 @@ func TestExprNew_FullyQualified(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -39380,7 +39380,7 @@ func TestExprPrint(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -39514,7 +39514,7 @@ func TestExprPropertyFetch(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -39658,7 +39658,7 @@ func TestExprShellExec(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -39754,7 +39754,7 @@ func TestExprShortArray(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -39879,7 +39879,7 @@ func TestExprShortArray_Item(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -40113,7 +40113,7 @@ func TestExprShortArray_Items(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -40267,7 +40267,7 @@ func TestExprStaticCall(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -40441,7 +40441,7 @@ func TestExprStaticCall_Relative(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -40605,7 +40605,7 @@ func TestExprStaticCall_FullyQualified(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -40767,7 +40767,7 @@ func TestExprStaticCall_Var(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -40927,7 +40927,7 @@ func TestExprStaticCall_VarVar(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -41069,7 +41069,7 @@ func TestExprStaticPropertyFetch(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -41231,7 +41231,7 @@ func TestExprStaticPropertyFetch_Relative(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -41383,7 +41383,7 @@ func TestExprStaticPropertyFetch_FullyQualified(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -41608,7 +41608,7 @@ func TestExprTernary(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -41794,7 +41794,7 @@ func TestExprTernary_Simple(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -42149,7 +42149,7 @@ func TestExprTernary_NestedTrue(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -42504,7 +42504,7 @@ func TestExprTernary_NestedCond(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -42617,7 +42617,7 @@ func TestExprUnaryMinus(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -42730,7 +42730,7 @@ func TestExprUnaryPlus(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -42825,7 +42825,7 @@ func TestExprVariable(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -42938,7 +42938,7 @@ func TestExprVariable_Variable(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -43024,7 +43024,7 @@ func TestExprYield(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -43149,7 +43149,7 @@ func TestExprYield_Val(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -43335,7 +43335,7 @@ func TestExprYield_KeyVal(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -43452,7 +43452,7 @@ func TestExprYield_Expr(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -43630,7 +43630,7 @@ func TestExprYield_KeyExpr(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -45853,7 +45853,7 @@ func TestExprAssign(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -49068,7 +49068,7 @@ func TestExprBinary_BitwiseAnd(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -49944,7 +49944,7 @@ func TestExprCast_Array(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -50250,7 +50250,7 @@ func TestPhp5Strings(t *testing.T) { }, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -50736,7 +50736,7 @@ CAD; }, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, @@ -50765,7 +50765,7 @@ func TestPhp5ControlCharsErrors(t *testing.T) { parserErrors := []*errors.Error{} - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, diff --git a/internal/php5/php5_bench_test.go b/internal/php5/php5_bench_test.go index b17c36f..0092415 100644 --- a/internal/php5/php5_bench_test.go +++ b/internal/php5/php5_bench_test.go @@ -6,7 +6,7 @@ import ( "github.com/z7zmey/php-parser/internal/php5" "github.com/z7zmey/php-parser/internal/scanner" - "github.com/z7zmey/php-parser/pkg/cfg" + "github.com/z7zmey/php-parser/pkg/conf" "github.com/z7zmey/php-parser/pkg/version" ) @@ -17,7 +17,7 @@ func BenchmarkPhp5(b *testing.B) { } for n := 0; n < b.N; n++ { - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 5, Minor: 6, diff --git a/internal/php7/parser.go b/internal/php7/parser.go index eda2135..88e283f 100644 --- a/internal/php7/parser.go +++ b/internal/php7/parser.go @@ -4,7 +4,7 @@ import ( "github.com/z7zmey/php-parser/internal/position" "github.com/z7zmey/php-parser/internal/scanner" "github.com/z7zmey/php-parser/pkg/ast" - "github.com/z7zmey/php-parser/pkg/cfg" + "github.com/z7zmey/php-parser/pkg/conf" "github.com/z7zmey/php-parser/pkg/errors" "github.com/z7zmey/php-parser/pkg/token" ) @@ -19,7 +19,7 @@ type Parser struct { } // NewParser creates and returns new Parser -func NewParser(lexer *scanner.Lexer, config cfg.Config) *Parser { +func NewParser(lexer *scanner.Lexer, config conf.Config) *Parser { return &Parser{ Lexer: lexer, errHandlerFunc: config.ErrorHandlerFunc, diff --git a/internal/php7/parser_test.go b/internal/php7/parser_test.go index 6d09d67..a49aa4f 100644 --- a/internal/php7/parser_test.go +++ b/internal/php7/parser_test.go @@ -8,7 +8,7 @@ import ( "github.com/z7zmey/php-parser/internal/php7" "github.com/z7zmey/php-parser/internal/scanner" "github.com/z7zmey/php-parser/pkg/ast" - "github.com/z7zmey/php-parser/pkg/cfg" + "github.com/z7zmey/php-parser/pkg/conf" "github.com/z7zmey/php-parser/pkg/errors" "github.com/z7zmey/php-parser/pkg/position" "github.com/z7zmey/php-parser/pkg/token" @@ -97,7 +97,7 @@ func TestIdentifier(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -1673,7 +1673,7 @@ func TestPhp7ArgumentNode(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -3357,7 +3357,7 @@ func TestPhp7ParameterNode(t *testing.T) { }, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -3417,7 +3417,7 @@ func TestCommentEndFile(t *testing.T) { }, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -3544,7 +3544,7 @@ func TestName(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -3679,7 +3679,7 @@ func TestFullyQualified(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -3824,7 +3824,7 @@ func TestRelative(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -3970,7 +3970,7 @@ func TestScalarEncapsed_SimpleVar(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -4114,7 +4114,7 @@ func TestScalarEncapsed_SimpleVarOneChar(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -4277,7 +4277,7 @@ func TestScalarEncapsed_SimpleVarEndsEcapsed(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -4476,7 +4476,7 @@ func TestScalarEncapsed_StringVarCurveOpen(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -4676,7 +4676,7 @@ func TestScalarEncapsed_SimpleVarPropertyFetch(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -4840,7 +4840,7 @@ func TestScalarEncapsed_DollarOpenCurlyBraces(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -5043,7 +5043,7 @@ func TestScalarEncapsed_DollarOpenCurlyBracesDimNumber(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -5272,7 +5272,7 @@ func TestScalarEncapsed_CurlyOpenMethodCall(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -5451,7 +5451,7 @@ LBL; }, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -5630,7 +5630,7 @@ LBL; }, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -5763,7 +5763,7 @@ LBL; }, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -5874,7 +5874,7 @@ CAD; }, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -6007,7 +6007,7 @@ CAD; }, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -6095,7 +6095,7 @@ func TestScalarMagicConstant(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -6182,7 +6182,7 @@ func TestScalarNumber_LNumber(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -6269,7 +6269,7 @@ func TestScalarNumber_DNumber(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -6356,7 +6356,7 @@ func TestScalarNumber_Float(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -6443,7 +6443,7 @@ func TestScalarNumber_BinaryLNumber(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -6530,7 +6530,7 @@ func TestScalarNumber_BinaryDNumber(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -6617,7 +6617,7 @@ func TestScalarNumber_HLNumber(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -6704,7 +6704,7 @@ func TestScalarNumber_HDNumber(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -6791,7 +6791,7 @@ func TestScalarString_DoubleQuotedScalarString(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -6878,7 +6878,7 @@ func TestScalarString_DoubleQuotedScalarStringWithEscapedVar(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -6967,7 +6967,7 @@ func TestScalarString_MultilineDoubleQuotedScalarString(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -7054,7 +7054,7 @@ func TestScalarString_SingleQuotedScalarString(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -7143,7 +7143,7 @@ func TestScalarString_MultilineSingleQuotedScalarString(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -7351,7 +7351,7 @@ func TestStmtAltIf_AltIf(t *testing.T) { }, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -7668,7 +7668,7 @@ func TestStmtAltIf_AltElseIf(t *testing.T) { }, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -7924,7 +7924,7 @@ func TestStmtAltIf_AltElse(t *testing.T) { }, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -8400,7 +8400,7 @@ func TestStmtAltIf_AltElseElseIf(t *testing.T) { }, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -8804,7 +8804,7 @@ func TestStmtClassConstList(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -9175,7 +9175,7 @@ func TestStmtClassConstList_WithoutModifiers(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -9430,7 +9430,7 @@ func TestStmtClassMethod_SimpleClassMethod(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -9904,7 +9904,7 @@ func TestStmtClassMethod_PrivateProtectedClassMethod(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -10284,7 +10284,7 @@ func TestStmtClassMethod_Php7ClassMethod(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -10613,7 +10613,7 @@ func TestStmtClassMethod_AbstractClassMethod(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -10962,7 +10962,7 @@ func TestStmtClassMethod_Php7AbstractClassMethod(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -11094,7 +11094,7 @@ func TestStmtClass_SimpleClass(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -11259,7 +11259,7 @@ func TestStmtClass_AbstractClass(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -11499,7 +11499,7 @@ func TestStmtClass_ClassExtends(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -11741,7 +11741,7 @@ func TestStmtClass_ClassImplement(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -12036,7 +12036,7 @@ func TestStmtClass_ClassImplements(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -12398,7 +12398,7 @@ func TestStmtClass_AnonimousClass(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -12674,7 +12674,7 @@ func TestStmtConstList(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -12887,7 +12887,7 @@ func TestStmtContinue_Empty(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -13131,7 +13131,7 @@ func TestStmtContinue_Light(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -13391,7 +13391,7 @@ func TestStmtContinue(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -13555,7 +13555,7 @@ func TestStmtDeclare(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -13822,7 +13822,7 @@ func TestStmtDeclare_Stmts(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -14019,7 +14019,7 @@ func TestStmtDeclare_Alt(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -14199,7 +14199,7 @@ func TestStmtDo(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -14361,7 +14361,7 @@ func TestStmtEcho(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -14496,7 +14496,7 @@ func TestStmtEcho_Parenthesis(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -14583,7 +14583,7 @@ func TestStmtExpression(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -15052,7 +15052,7 @@ func TestStmtFor(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -15384,7 +15384,7 @@ func TestStmtFor_Alt(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -15613,7 +15613,7 @@ func TestStmtForeach(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -15843,7 +15843,7 @@ func TestStmtForeach_Expr(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -16094,7 +16094,7 @@ func TestStmtForeach_Alt(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -16384,7 +16384,7 @@ func TestStmtForeach_WithKey(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -16675,7 +16675,7 @@ func TestStmtForeach_ExprWithKey(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -16975,7 +16975,7 @@ func TestStmtForeach_WithRef(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -17313,7 +17313,7 @@ func TestStmtForeach_WithList(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -17465,7 +17465,7 @@ func TestStmtFunction(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -17646,7 +17646,7 @@ func TestStmtFunction_Return(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -18024,7 +18024,7 @@ func TestStmtFunction_ReturnVar(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -18246,7 +18246,7 @@ func TestStmtFunction_Ref(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -18459,7 +18459,7 @@ func TestStmtFunction_ReturnType(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -18578,7 +18578,7 @@ func TestStmtGlobal(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -18932,7 +18932,7 @@ func TestStmtGlobal_Vars(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -19090,7 +19090,7 @@ func TestStmtGotoLabel(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -19188,7 +19188,7 @@ func TestStmtHaltCompiler(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -19356,7 +19356,7 @@ func TestStmtIf(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -19656,7 +19656,7 @@ func TestStmtIf_ElseIf(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -19895,7 +19895,7 @@ func TestStmtIf_Else(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -20396,7 +20396,7 @@ func TestStmtIf_ElseElseIf(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -20927,7 +20927,7 @@ func TestStmtIf_ElseIfElseIfElse(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -21014,7 +21014,7 @@ func TestStmtInlineHtml(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -21146,7 +21146,7 @@ func TestStmtInterface(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -21343,7 +21343,7 @@ func TestStmtInterface_Extend(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -21593,7 +21593,7 @@ func TestStmtInterface_Extends(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -21712,7 +21712,7 @@ func TestStmtNamespace(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -21854,7 +21854,7 @@ func TestStmtNamespace_Stmts(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -21955,7 +21955,7 @@ func TestStmtNamespace_Anonymous(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -22176,7 +22176,7 @@ func TestStmtProperty(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -22540,7 +22540,7 @@ func TestStmtProperty_Properties(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -22904,7 +22904,7 @@ func TestStmtProperty_Properties2(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -23166,7 +23166,7 @@ func TestStmtProperty_PropertyType(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -23293,7 +23293,7 @@ func TestStmtStaticVar(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -23532,7 +23532,7 @@ func TestStmtStaticVar_Vars(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -23771,7 +23771,7 @@ func TestStmtStaticVar_Vars2(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -24180,7 +24180,7 @@ func TestStmtSwitch(t *testing.T) { }, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -24599,7 +24599,7 @@ func TestStmtSwitch_Semicolon(t *testing.T) { }, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -24978,7 +24978,7 @@ func TestStmtSwitch_Alt(t *testing.T) { }, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -25311,7 +25311,7 @@ func TestStmtSwitch_AltSemicolon(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -25428,7 +25428,7 @@ func TestStmtThrow(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -25560,7 +25560,7 @@ func TestStmtTrait(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -25788,7 +25788,7 @@ func TestStmtTraitUse(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -26069,7 +26069,7 @@ func TestStmtTraitUse_Uses(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -26372,7 +26372,7 @@ func TestStmtTraitUse_EmptyAdaptations(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -26791,7 +26791,7 @@ func TestStmtTraitUse_Modifier(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -27241,7 +27241,7 @@ func TestStmtTraitUse_AliasModifier(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -27905,7 +27905,7 @@ func TestStmtTraitUse_Adaptions(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -28022,7 +28022,7 @@ func TestStmtTry_Try(t *testing.T) { }, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -28305,7 +28305,7 @@ func TestStmtTry_TryCatch(t *testing.T) { }, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -28629,7 +28629,7 @@ func TestStmtTry_Php7TryCatch(t *testing.T) { }, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -29077,7 +29077,7 @@ func TestStmtTry_TryCatchCatch(t *testing.T) { }, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -29423,7 +29423,7 @@ func TestStmtTry_TryCatchFinally(t *testing.T) { }, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -30051,7 +30051,7 @@ func TestStmtTry_TryCatchCatchCatch(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -30178,7 +30178,7 @@ func TestStmtUnset(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -30356,7 +30356,7 @@ func TestStmtUnset_Vars(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -30544,7 +30544,7 @@ func TestStmtUnset_TrailingComma(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -30673,7 +30673,7 @@ func TestStmtUse(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -30812,7 +30812,7 @@ func TestStmtUse_FullyQualified(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -31004,7 +31004,7 @@ func TestStmtUse_FullyQualifiedAlias(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -31194,7 +31194,7 @@ func TestStmtUse_List(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -31437,7 +31437,7 @@ func TestStmtUse_ListAlias(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -31668,7 +31668,7 @@ func TestStmtUse_ListFunctionType(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -32005,7 +32005,7 @@ func TestStmtUse_ListFunctionTypeAliases(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -32236,7 +32236,7 @@ func TestStmtUse_ListConstType(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -32573,7 +32573,7 @@ func TestStmtUse_ListConstTypeAliases(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -32822,7 +32822,7 @@ func TestStmtUse_GroupUse(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -33124,7 +33124,7 @@ func TestStmtUse_GroupUseAlias(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -33404,7 +33404,7 @@ func TestStmtUse_FunctionGroupUse(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -33684,7 +33684,7 @@ func TestStmtUse_ConstGroupUse(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -33995,7 +33995,7 @@ func TestStmtUse_MixedGroupUse(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -34208,7 +34208,7 @@ func TestStmtBreak_Empty(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -34452,7 +34452,7 @@ func TestStmtBreak_Light(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -34722,7 +34722,7 @@ func TestStmtBreak(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -34866,7 +34866,7 @@ func TestExprArrayDimFetch(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -35055,7 +35055,7 @@ func TestExprArrayDimFetch_Nested(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -35161,7 +35161,7 @@ func TestExprArray(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -35296,7 +35296,7 @@ func TestExprArray_Item(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -35540,7 +35540,7 @@ func TestExprArray_Items(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -35693,7 +35693,7 @@ func TestExprArray_ItemUnpack(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -35860,7 +35860,7 @@ func TestExprArrowFunction(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -36124,7 +36124,7 @@ func TestExprArrowFunction_ReturnType(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -36237,7 +36237,7 @@ func TestExprBitwiseNot(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -36350,7 +36350,7 @@ func TestExprBooleanNot(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -36484,7 +36484,7 @@ func TestExprClassConstFetch(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -36608,7 +36608,7 @@ func TestExprClassConstFetch_Static(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -36749,7 +36749,7 @@ func TestExprClone_Brackets(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -36874,7 +36874,7 @@ func TestExprClone(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -37001,7 +37001,7 @@ func TestExprClosure(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -37396,7 +37396,7 @@ func TestExprClosure_Use(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -37791,7 +37791,7 @@ func TestExprClosure_Use2(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -37981,7 +37981,7 @@ func TestExprClosure_ReturnType(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -38086,7 +38086,7 @@ func TestExprConstFetch(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -38211,7 +38211,7 @@ func TestExprConstFetch_Relative(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -38326,7 +38326,7 @@ func TestExprConstFetch_FullyQualified(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -38459,7 +38459,7 @@ func TestExprEmpty(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -38572,7 +38572,7 @@ func TestExprErrorSuppress(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -38705,7 +38705,7 @@ func TestExprEval(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -38791,7 +38791,7 @@ func TestExprExit(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -38897,7 +38897,7 @@ func TestExprExit_Empty(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -39030,7 +39030,7 @@ func TestExprExit_Expr(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -39116,7 +39116,7 @@ func TestExprDie(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -39222,7 +39222,7 @@ func TestExprDie_Empty(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -39355,7 +39355,7 @@ func TestExprDie_Expr(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -39480,7 +39480,7 @@ func TestExprFunctionCall(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -39625,7 +39625,7 @@ func TestExprFunctionCall_Relative(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -39798,7 +39798,7 @@ func TestExprFunctionCall_FullyQualified(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -39988,7 +39988,7 @@ func TestExprFunctionCall_Var(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -40187,7 +40187,7 @@ func TestExprFunctionCall_ExprArg(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -40300,7 +40300,7 @@ func TestExprPostDec(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -40413,7 +40413,7 @@ func TestExprPostInc(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -40526,7 +40526,7 @@ func TestExprPreDec(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -40639,7 +40639,7 @@ func TestExprPreInc(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -40764,7 +40764,7 @@ func TestExprInclude(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -40889,7 +40889,7 @@ func TestExprInclude_Once(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -41014,7 +41014,7 @@ func TestExprRequire(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -41139,7 +41139,7 @@ func TestExprRequire_Once(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -41305,7 +41305,7 @@ func TestExprInstanceOf(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -41491,7 +41491,7 @@ func TestExprInstanceOf_Relative(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -41667,7 +41667,7 @@ func TestExprInstanceOf_FullyQualified(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -41802,7 +41802,7 @@ func TestExprIsset(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -41988,7 +41988,7 @@ func TestExprIsset_Variables(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -42163,7 +42163,7 @@ func TestExprList_Empty(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -42375,7 +42375,7 @@ func TestExprList(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -42615,7 +42615,7 @@ func TestExprList_ArrayIndex(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -42875,7 +42875,7 @@ func TestExprList_List(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -43112,7 +43112,7 @@ func TestExprList_EmptyItem(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -43395,7 +43395,7 @@ func TestExprList_EmptyItems(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -43547,7 +43547,7 @@ func TestExprMethodCall(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -43674,7 +43674,7 @@ func TestExprNew(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -43841,7 +43841,7 @@ func TestExprNew_Relative(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -43998,7 +43998,7 @@ func TestExprNew_FullyQualified(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -44285,7 +44285,7 @@ func TestExprNew_Anonymous(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -44426,7 +44426,7 @@ func TestExprPrint(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -44558,7 +44558,7 @@ func TestExprPropertyFetch(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -44702,7 +44702,7 @@ func TestExprShellExec(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -44798,7 +44798,7 @@ func TestExprShortArray(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -44923,7 +44923,7 @@ func TestExprShortArray_Item(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -45157,7 +45157,7 @@ func TestExprShortArray_Items(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -45359,7 +45359,7 @@ func TestExprShortList(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -45589,7 +45589,7 @@ func TestExprShortList_ArrayIndex(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -45839,7 +45839,7 @@ func TestExprShortList_List(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -45993,7 +45993,7 @@ func TestExprStaticCall(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -46167,7 +46167,7 @@ func TestExprStaticCall_Relative(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -46331,7 +46331,7 @@ func TestExprStaticCall_FullyQualified(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -46493,7 +46493,7 @@ func TestExprStaticCall_Var(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -46653,7 +46653,7 @@ func TestExprStaticCall_VarVar(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -46795,7 +46795,7 @@ func TestExprStaticPropertyFetch(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -46957,7 +46957,7 @@ func TestExprStaticPropertyFetch_Relative(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -47109,7 +47109,7 @@ func TestExprStaticPropertyFetch_FullyQualified(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -47334,7 +47334,7 @@ func TestExprTernary(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -47520,7 +47520,7 @@ func TestExprTernary_Simple(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -47875,7 +47875,7 @@ func TestExprTernary_NestedTrue(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -48230,7 +48230,7 @@ func TestExprTernary_NestedCond(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -48343,7 +48343,7 @@ func TestExprUnaryMinus(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -48456,7 +48456,7 @@ func TestExprUnaryPlus(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -48551,7 +48551,7 @@ func TestExprVariable(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -48664,7 +48664,7 @@ func TestExprVariable_Variable(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -48750,7 +48750,7 @@ func TestExprYield(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -48875,7 +48875,7 @@ func TestExprYield_Val(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -49061,7 +49061,7 @@ func TestExprYield_KeyVal(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -49178,7 +49178,7 @@ func TestExprYield_Expr(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -49356,7 +49356,7 @@ func TestExprYield_KeyExpr(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -49481,7 +49481,7 @@ func TestExprYieldFrom(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -51831,7 +51831,7 @@ func TestExprAssign_Assign(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -55300,7 +55300,7 @@ func TestExprBinary_BitwiseAnd(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -56176,7 +56176,7 @@ func TestExprCast_Array(t *testing.T) { EndTkn: &token.Token{}, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -56482,7 +56482,7 @@ func TestStrings(t *testing.T) { }, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -56968,7 +56968,7 @@ CAD; }, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -56997,7 +56997,7 @@ func TestControlCharsErrors(t *testing.T) { parserErrors := []*errors.Error{} - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, diff --git a/internal/php7/php7_bench_test.go b/internal/php7/php7_bench_test.go index 961688d..973265d 100644 --- a/internal/php7/php7_bench_test.go +++ b/internal/php7/php7_bench_test.go @@ -6,7 +6,7 @@ import ( "github.com/z7zmey/php-parser/internal/php7" "github.com/z7zmey/php-parser/internal/scanner" - "github.com/z7zmey/php-parser/pkg/cfg" + "github.com/z7zmey/php-parser/pkg/conf" "github.com/z7zmey/php-parser/pkg/version" ) @@ -18,7 +18,7 @@ func BenchmarkPhp7(b *testing.B) { } for n := 0; n < b.N; n++ { - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, diff --git a/internal/scanner/lexer.go b/internal/scanner/lexer.go index 6725ce6..163bdc3 100644 --- a/internal/scanner/lexer.go +++ b/internal/scanner/lexer.go @@ -4,7 +4,7 @@ import ( "bytes" "strings" - "github.com/z7zmey/php-parser/pkg/cfg" + "github.com/z7zmey/php-parser/pkg/conf" "github.com/z7zmey/php-parser/pkg/errors" "github.com/z7zmey/php-parser/pkg/position" "github.com/z7zmey/php-parser/pkg/token" @@ -27,7 +27,7 @@ type Lexer struct { newLines NewLines } -func NewLexer(data []byte, config cfg.Config) *Lexer { +func NewLexer(data []byte, config conf.Config) *Lexer { lex := &Lexer{ data: data, phpVersion: config.Version, diff --git a/internal/scanner/scanner_test.go b/internal/scanner/scanner_test.go index 6f26368..c082854 100644 --- a/internal/scanner/scanner_test.go +++ b/internal/scanner/scanner_test.go @@ -4,7 +4,7 @@ import ( "gotest.tools/assert" "testing" - "github.com/z7zmey/php-parser/pkg/cfg" + "github.com/z7zmey/php-parser/pkg/conf" "github.com/z7zmey/php-parser/pkg/errors" "github.com/z7zmey/php-parser/pkg/position" "github.com/z7zmey/php-parser/pkg/token" @@ -355,7 +355,7 @@ func TestTokens(t *testing.T) { token.T_UNSET_CAST.String(), } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -388,7 +388,7 @@ func TestShebang(t *testing.T) { "\n", } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -413,7 +413,7 @@ func TestShebangHtml(t *testing.T) { 0.1 ` - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -468,7 +468,7 @@ func TestNumberTokens(t *testing.T) { token.T_DNUMBER.String(), } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -530,7 +530,7 @@ func TestConstantStrings(t *testing.T) { token.T_CONSTANT_ENCAPSED_STRING.String(), } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -582,7 +582,7 @@ func TestSingleQuoteStringTokens(t *testing.T) { token.T_CONSTANT_ENCAPSED_STRING.String(), } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -682,7 +682,7 @@ func TestTeplateStringTokens(t *testing.T) { token.ID(int('"')).String(), } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -778,7 +778,7 @@ func TestBackquoteStringTokens(t *testing.T) { token.ID(int('`')).String(), } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -877,7 +877,7 @@ CAT; token.ID(int(';')).String(), } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -955,7 +955,7 @@ CAT token.T_END_HEREDOC.String(), } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -999,7 +999,7 @@ CAT; token.ID(int(';')).String(), } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -1035,7 +1035,7 @@ func TestHereDocTokens73(t *testing.T) { token.T_VARIABLE.String(), } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -1070,7 +1070,7 @@ CAT;` token.ID(int(';')).String(), } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 2, @@ -1098,7 +1098,7 @@ func TestHereDocUnclosed(t *testing.T) { token.T_START_HEREDOC.String(), } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -1135,7 +1135,7 @@ func TestInlineHtmlNopTokens(t *testing.T) { token.T_INLINE_HTML.String(), } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -1175,7 +1175,7 @@ func TestStringTokensAfterVariable(t *testing.T) { "\"", } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -1214,7 +1214,7 @@ func TestSlashAfterVariable(t *testing.T) { "3", } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -1257,7 +1257,7 @@ func TestCommentEnd(t *testing.T) { }, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -1294,7 +1294,7 @@ func TestCommentNewLine(t *testing.T) { }, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -1331,7 +1331,7 @@ func TestCommentNewLine1(t *testing.T) { }, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -1368,7 +1368,7 @@ func TestCommentNewLine2(t *testing.T) { }, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -1406,7 +1406,7 @@ func TestCommentWithPhpEndTag(t *testing.T) { }, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -1444,7 +1444,7 @@ func TestInlineComment(t *testing.T) { }, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -1482,7 +1482,7 @@ func TestInlineComment2(t *testing.T) { }, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -1524,7 +1524,7 @@ func TestEmptyInlineComment(t *testing.T) { }, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -1562,7 +1562,7 @@ func TestEmptyInlineComment2(t *testing.T) { }, } - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -1584,7 +1584,7 @@ func TestMethodCallTokens(t *testing.T) { src := ` bar ( '' ) ;` - config := cfg.Config{ + config := conf.Config{ Version: &version.Version{ Major: 7, Minor: 4, @@ -1692,7 +1692,7 @@ func TestYieldFromTokens(t *testing.T) { src := `