diff --git a/cmd/php-parser/main.go b/cmd/php-parser/main.go index a675f2e..c5f2756 100644 --- a/cmd/php-parser/main.go +++ b/cmd/php-parser/main.go @@ -16,15 +16,15 @@ import ( "github.com/pkg/profile" "github.com/yookoala/realpath" - "github.com/VKCOM/php-parser/pkg/ast" - "github.com/VKCOM/php-parser/pkg/conf" - "github.com/VKCOM/php-parser/pkg/errors" - "github.com/VKCOM/php-parser/pkg/parser" - "github.com/VKCOM/php-parser/pkg/version" - "github.com/VKCOM/php-parser/pkg/visitor/dumper" - "github.com/VKCOM/php-parser/pkg/visitor/nsresolver" - "github.com/VKCOM/php-parser/pkg/visitor/printer" - "github.com/VKCOM/php-parser/pkg/visitor/traverser" + "github.com/laytan/php-parser/pkg/ast" + "github.com/laytan/php-parser/pkg/conf" + "github.com/laytan/php-parser/pkg/errors" + "github.com/laytan/php-parser/pkg/parser" + "github.com/laytan/php-parser/pkg/version" + "github.com/laytan/php-parser/pkg/visitor/dumper" + "github.com/laytan/php-parser/pkg/visitor/nsresolver" + "github.com/laytan/php-parser/pkg/visitor/printer" + "github.com/laytan/php-parser/pkg/visitor/traverser" ) var ( diff --git a/go.mod b/go.mod index fceeaf6..08bb5c8 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/VKCOM/php-parser +module github.com/laytan/php-parser go 1.13 diff --git a/internal/php7/lexer.go b/internal/php7/lexer.go index c4991af..d5be020 100644 --- a/internal/php7/lexer.go +++ b/internal/php7/lexer.go @@ -4,12 +4,12 @@ import ( "bytes" "strings" - pos "github.com/VKCOM/php-parser/internal/position" - "github.com/VKCOM/php-parser/pkg/conf" - "github.com/VKCOM/php-parser/pkg/errors" - "github.com/VKCOM/php-parser/pkg/position" - "github.com/VKCOM/php-parser/pkg/token" - "github.com/VKCOM/php-parser/pkg/version" + pos "github.com/laytan/php-parser/internal/position" + "github.com/laytan/php-parser/pkg/conf" + "github.com/laytan/php-parser/pkg/errors" + "github.com/laytan/php-parser/pkg/position" + "github.com/laytan/php-parser/pkg/token" + "github.com/laytan/php-parser/pkg/version" ) type Lexer struct { diff --git a/internal/php7/node.go b/internal/php7/node.go index 7287f75..cc63598 100644 --- a/internal/php7/node.go +++ b/internal/php7/node.go @@ -1,9 +1,9 @@ package php7 import ( - "github.com/VKCOM/php-parser/pkg/ast" - "github.com/VKCOM/php-parser/pkg/position" - "github.com/VKCOM/php-parser/pkg/token" + "github.com/laytan/php-parser/pkg/ast" + "github.com/laytan/php-parser/pkg/position" + "github.com/laytan/php-parser/pkg/token" ) type ParserBrackets struct { diff --git a/internal/php7/parser.go b/internal/php7/parser.go index 4605d11..8f7a0b4 100644 --- a/internal/php7/parser.go +++ b/internal/php7/parser.go @@ -1,11 +1,11 @@ package php7 import ( - "github.com/VKCOM/php-parser/internal/position" - "github.com/VKCOM/php-parser/pkg/ast" - "github.com/VKCOM/php-parser/pkg/conf" - "github.com/VKCOM/php-parser/pkg/errors" - "github.com/VKCOM/php-parser/pkg/token" + "github.com/laytan/php-parser/internal/position" + "github.com/laytan/php-parser/pkg/ast" + "github.com/laytan/php-parser/pkg/conf" + "github.com/laytan/php-parser/pkg/errors" + "github.com/laytan/php-parser/pkg/token" ) // Parser structure diff --git a/internal/php7/parser_test.go b/internal/php7/parser_test.go index c90eca2..1d59455 100644 --- a/internal/php7/parser_test.go +++ b/internal/php7/parser_test.go @@ -5,13 +5,13 @@ import ( "gotest.tools/assert" - "github.com/VKCOM/php-parser/internal/php7" - "github.com/VKCOM/php-parser/pkg/ast" - "github.com/VKCOM/php-parser/pkg/conf" - "github.com/VKCOM/php-parser/pkg/errors" - "github.com/VKCOM/php-parser/pkg/position" - "github.com/VKCOM/php-parser/pkg/token" - "github.com/VKCOM/php-parser/pkg/version" + "github.com/laytan/php-parser/internal/php7" + "github.com/laytan/php-parser/pkg/ast" + "github.com/laytan/php-parser/pkg/conf" + "github.com/laytan/php-parser/pkg/errors" + "github.com/laytan/php-parser/pkg/position" + "github.com/laytan/php-parser/pkg/token" + "github.com/laytan/php-parser/pkg/version" ) func TestMain(m *testing.M) { diff --git a/internal/php7/php7.go b/internal/php7/php7.go index 3464bab..dc62a97 100644 Binary files a/internal/php7/php7.go and b/internal/php7/php7.go differ diff --git a/internal/php7/php7_bench_test.go b/internal/php7/php7_bench_test.go index e6e26f3..676c18c 100644 --- a/internal/php7/php7_bench_test.go +++ b/internal/php7/php7_bench_test.go @@ -5,9 +5,9 @@ import ( "path/filepath" "testing" - "github.com/VKCOM/php-parser/internal/php7" - "github.com/VKCOM/php-parser/pkg/conf" - "github.com/VKCOM/php-parser/pkg/version" + "github.com/laytan/php-parser/internal/php7" + "github.com/laytan/php-parser/pkg/conf" + "github.com/laytan/php-parser/pkg/version" ) func BenchmarkPhp7(b *testing.B) { diff --git a/internal/php7/scanner.go b/internal/php7/scanner.go index 7d28c03..656aa16 100644 --- a/internal/php7/scanner.go +++ b/internal/php7/scanner.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/VKCOM/php-parser/pkg/token" + "github.com/laytan/php-parser/pkg/token" ) // line internal/php7/scanner.go:15 diff --git a/internal/php7/scanner_test.go b/internal/php7/scanner_test.go index 3f1005b..4bcece1 100644 --- a/internal/php7/scanner_test.go +++ b/internal/php7/scanner_test.go @@ -4,11 +4,11 @@ import ( "gotest.tools/assert" "testing" - "github.com/VKCOM/php-parser/pkg/conf" - "github.com/VKCOM/php-parser/pkg/errors" - "github.com/VKCOM/php-parser/pkg/position" - "github.com/VKCOM/php-parser/pkg/token" - "github.com/VKCOM/php-parser/pkg/version" + "github.com/laytan/php-parser/pkg/conf" + "github.com/laytan/php-parser/pkg/errors" + "github.com/laytan/php-parser/pkg/position" + "github.com/laytan/php-parser/pkg/token" + "github.com/laytan/php-parser/pkg/version" ) func TestTokens(t *testing.T) { diff --git a/internal/php8/builder.go b/internal/php8/builder.go index ae79647..c19fd40 100644 --- a/internal/php8/builder.go +++ b/internal/php8/builder.go @@ -3,10 +3,10 @@ package php8 import ( "bytes" - "github.com/VKCOM/php-parser/internal/position" - "github.com/VKCOM/php-parser/pkg/ast" - position2 "github.com/VKCOM/php-parser/pkg/position" - "github.com/VKCOM/php-parser/pkg/token" + "github.com/laytan/php-parser/internal/position" + "github.com/laytan/php-parser/pkg/ast" + position2 "github.com/laytan/php-parser/pkg/position" + "github.com/laytan/php-parser/pkg/token" ) // Builder is responsible for creating nodes inside grammar rules. diff --git a/internal/php8/lexer.go b/internal/php8/lexer.go index 12d2a34..e292f7f 100644 --- a/internal/php8/lexer.go +++ b/internal/php8/lexer.go @@ -4,12 +4,12 @@ import ( "bytes" "strings" - pos "github.com/VKCOM/php-parser/internal/position" - "github.com/VKCOM/php-parser/pkg/conf" - "github.com/VKCOM/php-parser/pkg/errors" - "github.com/VKCOM/php-parser/pkg/position" - "github.com/VKCOM/php-parser/pkg/token" - "github.com/VKCOM/php-parser/pkg/version" + pos "github.com/laytan/php-parser/internal/position" + "github.com/laytan/php-parser/pkg/conf" + "github.com/laytan/php-parser/pkg/errors" + "github.com/laytan/php-parser/pkg/position" + "github.com/laytan/php-parser/pkg/token" + "github.com/laytan/php-parser/pkg/version" ) type Lexer struct { diff --git a/internal/php8/node.go b/internal/php8/node.go index a383c2d..69e0d24 100644 --- a/internal/php8/node.go +++ b/internal/php8/node.go @@ -1,9 +1,9 @@ package php8 import ( - "github.com/VKCOM/php-parser/pkg/ast" - "github.com/VKCOM/php-parser/pkg/position" - "github.com/VKCOM/php-parser/pkg/token" + "github.com/laytan/php-parser/pkg/ast" + "github.com/laytan/php-parser/pkg/position" + "github.com/laytan/php-parser/pkg/token" ) type ParserBrackets struct { diff --git a/internal/php8/parser.go b/internal/php8/parser.go index c903b40..f07aae9 100644 --- a/internal/php8/parser.go +++ b/internal/php8/parser.go @@ -1,11 +1,11 @@ package php8 import ( - "github.com/VKCOM/php-parser/internal/position" - "github.com/VKCOM/php-parser/pkg/ast" - "github.com/VKCOM/php-parser/pkg/conf" - "github.com/VKCOM/php-parser/pkg/errors" - "github.com/VKCOM/php-parser/pkg/token" + "github.com/laytan/php-parser/internal/position" + "github.com/laytan/php-parser/pkg/ast" + "github.com/laytan/php-parser/pkg/conf" + "github.com/laytan/php-parser/pkg/errors" + "github.com/laytan/php-parser/pkg/token" ) // Parser structure diff --git a/internal/php8/parser_php8_1_test.go b/internal/php8/parser_php8_1_test.go index bfa44d8..33652a0 100644 --- a/internal/php8/parser_php8_1_test.go +++ b/internal/php8/parser_php8_1_test.go @@ -3,7 +3,7 @@ package php8_test import ( "testing" - "github.com/VKCOM/php-parser/internal/tester" + "github.com/laytan/php-parser/internal/tester" ) func TestReadonlyModifier(t *testing.T) { diff --git a/internal/php8/parser_php8_2_test.go b/internal/php8/parser_php8_2_test.go index 0629516..9668349 100644 --- a/internal/php8/parser_php8_2_test.go +++ b/internal/php8/parser_php8_2_test.go @@ -3,7 +3,7 @@ package php8_test import ( "testing" - "github.com/VKCOM/php-parser/internal/tester" + "github.com/laytan/php-parser/internal/tester" ) func TestClassReadonlyModifier(t *testing.T) { diff --git a/internal/php8/parser_php8_test.go b/internal/php8/parser_php8_test.go index 413d598..f48e2ba 100644 --- a/internal/php8/parser_php8_test.go +++ b/internal/php8/parser_php8_test.go @@ -3,14 +3,14 @@ package php8_test import ( "testing" - "github.com/VKCOM/php-parser/internal/tester" - "github.com/VKCOM/php-parser/pkg/ast" - "github.com/VKCOM/php-parser/pkg/conf" - "github.com/VKCOM/php-parser/pkg/errors" - "github.com/VKCOM/php-parser/pkg/parser" - "github.com/VKCOM/php-parser/pkg/position" - "github.com/VKCOM/php-parser/pkg/token" - "github.com/VKCOM/php-parser/pkg/version" + "github.com/laytan/php-parser/internal/tester" + "github.com/laytan/php-parser/pkg/ast" + "github.com/laytan/php-parser/pkg/conf" + "github.com/laytan/php-parser/pkg/errors" + "github.com/laytan/php-parser/pkg/parser" + "github.com/laytan/php-parser/pkg/position" + "github.com/laytan/php-parser/pkg/token" + "github.com/laytan/php-parser/pkg/version" "gotest.tools/assert" ) diff --git a/internal/php8/parser_test.go b/internal/php8/parser_test.go index 3e36157..b0305af 100644 --- a/internal/php8/parser_test.go +++ b/internal/php8/parser_test.go @@ -3,15 +3,15 @@ package php8_test import ( "testing" - "github.com/VKCOM/php-parser/internal/php8" + "github.com/laytan/php-parser/internal/php8" "gotest.tools/assert" - "github.com/VKCOM/php-parser/pkg/ast" - "github.com/VKCOM/php-parser/pkg/conf" - "github.com/VKCOM/php-parser/pkg/errors" - "github.com/VKCOM/php-parser/pkg/position" - "github.com/VKCOM/php-parser/pkg/token" - "github.com/VKCOM/php-parser/pkg/version" + "github.com/laytan/php-parser/pkg/ast" + "github.com/laytan/php-parser/pkg/conf" + "github.com/laytan/php-parser/pkg/errors" + "github.com/laytan/php-parser/pkg/position" + "github.com/laytan/php-parser/pkg/token" + "github.com/laytan/php-parser/pkg/version" ) func TestMain(m *testing.M) { diff --git a/internal/php8/php8.go b/internal/php8/php8.go index 86860f3..f90273a 100644 --- a/internal/php8/php8.go +++ b/internal/php8/php8.go @@ -10,8 +10,8 @@ import __yyfmt__ "fmt" import ( "strconv" - "github.com/VKCOM/php-parser/pkg/ast" - "github.com/VKCOM/php-parser/pkg/token" + "github.com/laytan/php-parser/pkg/ast" + "github.com/laytan/php-parser/pkg/token" ) // line internal/php8/php8.y:13 diff --git a/internal/php8/php8_bench_test.go b/internal/php8/php8_bench_test.go index bc44c91..643ef68 100644 --- a/internal/php8/php8_bench_test.go +++ b/internal/php8/php8_bench_test.go @@ -5,9 +5,9 @@ import ( "path/filepath" "testing" - "github.com/VKCOM/php-parser/internal/php8" - "github.com/VKCOM/php-parser/pkg/conf" - "github.com/VKCOM/php-parser/pkg/version" + "github.com/laytan/php-parser/internal/php8" + "github.com/laytan/php-parser/pkg/conf" + "github.com/laytan/php-parser/pkg/version" ) func BenchmarkPhp8(b *testing.B) { diff --git a/internal/php8/scanner.go b/internal/php8/scanner.go index 2452032..ca5f6d0 100644 --- a/internal/php8/scanner.go +++ b/internal/php8/scanner.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/VKCOM/php-parser/pkg/token" + "github.com/laytan/php-parser/pkg/token" ) // line internal/php8/scanner.go:15 diff --git a/internal/php8/scanner.rl b/internal/php8/scanner.rl index a551c9e..ed83c35 100644 --- a/internal/php8/scanner.rl +++ b/internal/php8/scanner.rl @@ -1,3 +1,4 @@ +// ragel_subtype=go package php8 import ( diff --git a/internal/php8/scanner_php8_1_test.go b/internal/php8/scanner_php8_1_test.go index 0c03206..722f06a 100644 --- a/internal/php8/scanner_php8_1_test.go +++ b/internal/php8/scanner_php8_1_test.go @@ -3,8 +3,8 @@ package php8_test import ( "testing" - "github.com/VKCOM/php-parser/internal/tester" - "github.com/VKCOM/php-parser/pkg/token" + "github.com/laytan/php-parser/internal/tester" + "github.com/laytan/php-parser/pkg/token" ) func TestReadonlyTokens(t *testing.T) { diff --git a/internal/php8/scanner_php8_test.go b/internal/php8/scanner_php8_test.go index f81f598..cfad51e 100644 --- a/internal/php8/scanner_php8_test.go +++ b/internal/php8/scanner_php8_test.go @@ -3,11 +3,11 @@ package php8_test import ( "testing" - "github.com/VKCOM/php-parser/internal/php8" - "github.com/VKCOM/php-parser/internal/tester" - "github.com/VKCOM/php-parser/pkg/conf" - "github.com/VKCOM/php-parser/pkg/position" - "github.com/VKCOM/php-parser/pkg/token" + "github.com/laytan/php-parser/internal/php8" + "github.com/laytan/php-parser/internal/tester" + "github.com/laytan/php-parser/pkg/conf" + "github.com/laytan/php-parser/pkg/position" + "github.com/laytan/php-parser/pkg/token" "gotest.tools/assert" ) diff --git a/internal/php8/scanner_test.go b/internal/php8/scanner_test.go index 998e5c9..354b7b3 100644 --- a/internal/php8/scanner_test.go +++ b/internal/php8/scanner_test.go @@ -5,11 +5,11 @@ import ( "gotest.tools/assert" - "github.com/VKCOM/php-parser/pkg/conf" - "github.com/VKCOM/php-parser/pkg/errors" - "github.com/VKCOM/php-parser/pkg/position" - "github.com/VKCOM/php-parser/pkg/token" - "github.com/VKCOM/php-parser/pkg/version" + "github.com/laytan/php-parser/pkg/conf" + "github.com/laytan/php-parser/pkg/errors" + "github.com/laytan/php-parser/pkg/position" + "github.com/laytan/php-parser/pkg/token" + "github.com/laytan/php-parser/pkg/version" ) func TestTokens(t *testing.T) { diff --git a/internal/position/newline_test.go b/internal/position/newline_test.go index ad602ca..8a74dbb 100644 --- a/internal/position/newline_test.go +++ b/internal/position/newline_test.go @@ -4,7 +4,7 @@ import ( "strconv" "testing" - "github.com/VKCOM/php-parser/internal/position" + "github.com/laytan/php-parser/internal/position" "gotest.tools/assert" ) diff --git a/internal/position/position.go b/internal/position/position.go index 7a44a63..9086d33 100644 --- a/internal/position/position.go +++ b/internal/position/position.go @@ -1,9 +1,9 @@ package position import ( - "github.com/VKCOM/php-parser/pkg/ast" - "github.com/VKCOM/php-parser/pkg/position" - "github.com/VKCOM/php-parser/pkg/token" + "github.com/laytan/php-parser/pkg/ast" + "github.com/laytan/php-parser/pkg/position" + "github.com/laytan/php-parser/pkg/token" ) type startPos struct { diff --git a/internal/position/position_test.go b/internal/position/position_test.go index 1dd0c51..788b794 100644 --- a/internal/position/position_test.go +++ b/internal/position/position_test.go @@ -5,10 +5,10 @@ import ( "gotest.tools/assert" - builder "github.com/VKCOM/php-parser/internal/position" - "github.com/VKCOM/php-parser/pkg/ast" - "github.com/VKCOM/php-parser/pkg/position" - "github.com/VKCOM/php-parser/pkg/token" + builder "github.com/laytan/php-parser/internal/position" + "github.com/laytan/php-parser/pkg/ast" + "github.com/laytan/php-parser/pkg/position" + "github.com/laytan/php-parser/pkg/token" ) func TestNewTokenPosition(t *testing.T) { diff --git a/internal/tester/lexer_token_freefloating.go b/internal/tester/lexer_token_freefloating.go index e4565bd..7ac62b1 100644 --- a/internal/tester/lexer_token_freefloating.go +++ b/internal/tester/lexer_token_freefloating.go @@ -3,11 +3,11 @@ package tester import ( "testing" - "github.com/VKCOM/php-parser/internal/php7" - "github.com/VKCOM/php-parser/internal/php8" - "github.com/VKCOM/php-parser/pkg/conf" - "github.com/VKCOM/php-parser/pkg/token" - "github.com/VKCOM/php-parser/pkg/version" + "github.com/laytan/php-parser/internal/php7" + "github.com/laytan/php-parser/internal/php8" + "github.com/laytan/php-parser/pkg/conf" + "github.com/laytan/php-parser/pkg/token" + "github.com/laytan/php-parser/pkg/version" "gotest.tools/assert" ) diff --git a/internal/tester/lexer_token_string.go b/internal/tester/lexer_token_string.go index 3080031..7ef31d8 100644 --- a/internal/tester/lexer_token_string.go +++ b/internal/tester/lexer_token_string.go @@ -3,10 +3,10 @@ package tester import ( "testing" - "github.com/VKCOM/php-parser/internal/php7" - "github.com/VKCOM/php-parser/internal/php8" - "github.com/VKCOM/php-parser/pkg/conf" - "github.com/VKCOM/php-parser/pkg/version" + "github.com/laytan/php-parser/internal/php7" + "github.com/laytan/php-parser/internal/php8" + "github.com/laytan/php-parser/pkg/conf" + "github.com/laytan/php-parser/pkg/version" "gotest.tools/assert" ) diff --git a/internal/tester/lexer_token_struct.go b/internal/tester/lexer_token_struct.go index eda5a38..032389d 100644 --- a/internal/tester/lexer_token_struct.go +++ b/internal/tester/lexer_token_struct.go @@ -3,11 +3,11 @@ package tester import ( "testing" - "github.com/VKCOM/php-parser/internal/php7" - "github.com/VKCOM/php-parser/internal/php8" - "github.com/VKCOM/php-parser/pkg/conf" - "github.com/VKCOM/php-parser/pkg/token" - "github.com/VKCOM/php-parser/pkg/version" + "github.com/laytan/php-parser/internal/php7" + "github.com/laytan/php-parser/internal/php8" + "github.com/laytan/php-parser/pkg/conf" + "github.com/laytan/php-parser/pkg/token" + "github.com/laytan/php-parser/pkg/version" "gotest.tools/assert" ) diff --git a/internal/tester/parse_print.go b/internal/tester/parse_print.go index 09a918e..8db3dda 100644 --- a/internal/tester/parse_print.go +++ b/internal/tester/parse_print.go @@ -4,11 +4,11 @@ import ( "bytes" "testing" - "github.com/VKCOM/php-parser/pkg/ast" - "github.com/VKCOM/php-parser/pkg/conf" - "github.com/VKCOM/php-parser/pkg/parser" - "github.com/VKCOM/php-parser/pkg/version" - "github.com/VKCOM/php-parser/pkg/visitor/printer" + "github.com/laytan/php-parser/pkg/ast" + "github.com/laytan/php-parser/pkg/conf" + "github.com/laytan/php-parser/pkg/parser" + "github.com/laytan/php-parser/pkg/version" + "github.com/laytan/php-parser/pkg/visitor/printer" "gotest.tools/assert" ) diff --git a/internal/tester/parser.go b/internal/tester/parser.go index 77e76e2..8c131b2 100644 --- a/internal/tester/parser.go +++ b/internal/tester/parser.go @@ -3,10 +3,10 @@ package tester import ( "testing" - "github.com/VKCOM/php-parser/pkg/ast" - "github.com/VKCOM/php-parser/pkg/conf" - "github.com/VKCOM/php-parser/pkg/parser" - "github.com/VKCOM/php-parser/pkg/version" + "github.com/laytan/php-parser/pkg/ast" + "github.com/laytan/php-parser/pkg/conf" + "github.com/laytan/php-parser/pkg/parser" + "github.com/laytan/php-parser/pkg/version" "gotest.tools/assert" ) diff --git a/internal/tester/parser_dump.go b/internal/tester/parser_dump.go index d566b59..2270de8 100644 --- a/internal/tester/parser_dump.go +++ b/internal/tester/parser_dump.go @@ -4,10 +4,10 @@ import ( "bytes" "testing" - "github.com/VKCOM/php-parser/pkg/conf" - "github.com/VKCOM/php-parser/pkg/parser" - "github.com/VKCOM/php-parser/pkg/version" - "github.com/VKCOM/php-parser/pkg/visitor/dumper" + "github.com/laytan/php-parser/pkg/conf" + "github.com/laytan/php-parser/pkg/parser" + "github.com/laytan/php-parser/pkg/version" + "github.com/laytan/php-parser/pkg/visitor/dumper" "gotest.tools/assert" ) diff --git a/internal/tester/parser_error.go b/internal/tester/parser_error.go index d29a6dc..416c0e8 100644 --- a/internal/tester/parser_error.go +++ b/internal/tester/parser_error.go @@ -3,10 +3,10 @@ package tester import ( "testing" - "github.com/VKCOM/php-parser/pkg/conf" - "github.com/VKCOM/php-parser/pkg/errors" - "github.com/VKCOM/php-parser/pkg/parser" - "github.com/VKCOM/php-parser/pkg/version" + "github.com/laytan/php-parser/pkg/conf" + "github.com/laytan/php-parser/pkg/errors" + "github.com/laytan/php-parser/pkg/parser" + "github.com/laytan/php-parser/pkg/version" "gotest.tools/assert" ) diff --git a/pkg/ast/ast.go b/pkg/ast/ast.go index 8cf2594..3513b74 100644 --- a/pkg/ast/ast.go +++ b/pkg/ast/ast.go @@ -1,6 +1,6 @@ package ast -import "github.com/VKCOM/php-parser/pkg/position" +import "github.com/laytan/php-parser/pkg/position" // The edge-case/overwrites, from node type name to their visitor function name. var TypeToVisitorNameMap = map[string]string{ diff --git a/pkg/ast/node.go b/pkg/ast/node.go index 1a64b28..2c052d1 100644 --- a/pkg/ast/node.go +++ b/pkg/ast/node.go @@ -1,8 +1,8 @@ package ast import ( - "github.com/VKCOM/php-parser/pkg/position" - "github.com/VKCOM/php-parser/pkg/token" + "github.com/laytan/php-parser/pkg/position" + "github.com/laytan/php-parser/pkg/token" ) //go:generate go run node_funcs_gen.go diff --git a/pkg/ast/node_funcs.go b/pkg/ast/node_funcs.go index 8b55164..a2cb970 100644 --- a/pkg/ast/node_funcs.go +++ b/pkg/ast/node_funcs.go @@ -2,7 +2,7 @@ package ast -import "github.com/VKCOM/php-parser/pkg/position" +import "github.com/laytan/php-parser/pkg/position" type Type int diff --git a/pkg/ast/node_funcs_gen.go b/pkg/ast/node_funcs_gen.go index b09fa4b..f652e0b 100644 --- a/pkg/ast/node_funcs_gen.go +++ b/pkg/ast/node_funcs_gen.go @@ -9,7 +9,7 @@ import ( "regexp" "text/template" - "github.com/VKCOM/php-parser/pkg/ast" + "github.com/laytan/php-parser/pkg/ast" ) type templData struct { @@ -27,7 +27,7 @@ var fileTempl = template.Must( package ast -import "github.com/VKCOM/php-parser/pkg/position" +import "github.com/laytan/php-parser/pkg/position" type Type int diff --git a/pkg/conf/conf.go b/pkg/conf/conf.go index f086d00..0ad5d8b 100644 --- a/pkg/conf/conf.go +++ b/pkg/conf/conf.go @@ -1,8 +1,8 @@ package conf import ( - "github.com/VKCOM/php-parser/pkg/errors" - "github.com/VKCOM/php-parser/pkg/version" + "github.com/laytan/php-parser/pkg/errors" + "github.com/laytan/php-parser/pkg/version" ) type Config struct { diff --git a/pkg/errors/error.go b/pkg/errors/error.go index 49d3f72..71a6349 100644 --- a/pkg/errors/error.go +++ b/pkg/errors/error.go @@ -3,7 +3,7 @@ package errors import ( "fmt" - "github.com/VKCOM/php-parser/pkg/position" + "github.com/laytan/php-parser/pkg/position" ) // Error parsing error diff --git a/pkg/errors/error_test.go b/pkg/errors/error_test.go index fff8f72..643d584 100644 --- a/pkg/errors/error_test.go +++ b/pkg/errors/error_test.go @@ -5,8 +5,8 @@ import ( "gotest.tools/assert" - "github.com/VKCOM/php-parser/pkg/errors" - "github.com/VKCOM/php-parser/pkg/position" + "github.com/laytan/php-parser/pkg/errors" + "github.com/laytan/php-parser/pkg/position" ) func TestConstructor(t *testing.T) { diff --git a/pkg/parser/doc.go b/pkg/parser/doc.go index 3166b4e..2bb464a 100644 --- a/pkg/parser/doc.go +++ b/pkg/parser/doc.go @@ -9,11 +9,11 @@ Package usage example: "log" "os" - "github.com/VKCOM/php-parser/pkg/conf" - "github.com/VKCOM/php-parser/pkg/errors" - "github.com/VKCOM/php-parser/pkg/parser" - "github.com/VKCOM/php-parser/pkg/version" - "github.com/VKCOM/php-parser/pkg/visitor/dumper" + "github.com/laytan/php-parser/pkg/conf" + "github.com/laytan/php-parser/pkg/errors" + "github.com/laytan/php-parser/pkg/parser" + "github.com/laytan/php-parser/pkg/version" + "github.com/laytan/php-parser/pkg/visitor/dumper" ) func main() { diff --git a/pkg/parser/parser.go b/pkg/parser/parser.go index 528faa3..0b1c652 100644 --- a/pkg/parser/parser.go +++ b/pkg/parser/parser.go @@ -3,11 +3,11 @@ package parser import ( "errors" - "github.com/VKCOM/php-parser/internal/php7" - "github.com/VKCOM/php-parser/internal/php8" - "github.com/VKCOM/php-parser/pkg/ast" - "github.com/VKCOM/php-parser/pkg/conf" - "github.com/VKCOM/php-parser/pkg/version" + "github.com/laytan/php-parser/internal/php7" + "github.com/laytan/php-parser/internal/php8" + "github.com/laytan/php-parser/pkg/ast" + "github.com/laytan/php-parser/pkg/conf" + "github.com/laytan/php-parser/pkg/version" ) var ( diff --git a/pkg/token/token.go b/pkg/token/token.go index b5eff5d..5ef30e8 100644 --- a/pkg/token/token.go +++ b/pkg/token/token.go @@ -1,6 +1,6 @@ package token -import "github.com/VKCOM/php-parser/pkg/position" +import "github.com/laytan/php-parser/pkg/position" //go:generate stringer -type=ID -output ./token_string.go type ID int diff --git a/pkg/version/version_test.go b/pkg/version/version_test.go index de2b43a..f327e98 100644 --- a/pkg/version/version_test.go +++ b/pkg/version/version_test.go @@ -5,7 +5,7 @@ import ( "gotest.tools/assert" - "github.com/VKCOM/php-parser/pkg/version" + "github.com/laytan/php-parser/pkg/version" ) func Test(t *testing.T) { diff --git a/pkg/visitor/dumper/dumper.go b/pkg/visitor/dumper/dumper.go index c76f152..d802f6c 100644 --- a/pkg/visitor/dumper/dumper.go +++ b/pkg/visitor/dumper/dumper.go @@ -5,10 +5,10 @@ import ( "strconv" "strings" - "github.com/VKCOM/php-parser/pkg/position" - "github.com/VKCOM/php-parser/pkg/token" + "github.com/laytan/php-parser/pkg/position" + "github.com/laytan/php-parser/pkg/token" - "github.com/VKCOM/php-parser/pkg/ast" + "github.com/laytan/php-parser/pkg/ast" ) type Dumper struct { diff --git a/pkg/visitor/dumper/dumper_test.go b/pkg/visitor/dumper/dumper_test.go index bcd9095..0298cac 100644 --- a/pkg/visitor/dumper/dumper_test.go +++ b/pkg/visitor/dumper/dumper_test.go @@ -4,11 +4,11 @@ import ( "bytes" "testing" - "github.com/VKCOM/php-parser/pkg/position" - "github.com/VKCOM/php-parser/pkg/token" - "github.com/VKCOM/php-parser/pkg/visitor/dumper" + "github.com/laytan/php-parser/pkg/position" + "github.com/laytan/php-parser/pkg/token" + "github.com/laytan/php-parser/pkg/visitor/dumper" - "github.com/VKCOM/php-parser/pkg/ast" + "github.com/laytan/php-parser/pkg/ast" ) func TestDumper_root(t *testing.T) { diff --git a/pkg/visitor/formatter/formatter.go b/pkg/visitor/formatter/formatter.go index b1c2ddf..fcb6e81 100644 --- a/pkg/visitor/formatter/formatter.go +++ b/pkg/visitor/formatter/formatter.go @@ -3,8 +3,8 @@ package formatter import ( "bytes" - "github.com/VKCOM/php-parser/pkg/ast" - "github.com/VKCOM/php-parser/pkg/token" + "github.com/laytan/php-parser/pkg/ast" + "github.com/laytan/php-parser/pkg/token" ) type formatterState int diff --git a/pkg/visitor/formatter/formatter_test.go b/pkg/visitor/formatter/formatter_test.go index dc825f4..08f2102 100644 --- a/pkg/visitor/formatter/formatter_test.go +++ b/pkg/visitor/formatter/formatter_test.go @@ -2,12 +2,12 @@ package formatter_test import ( "bytes" - "github.com/VKCOM/php-parser/pkg/token" - "github.com/VKCOM/php-parser/pkg/visitor/formatter" - "github.com/VKCOM/php-parser/pkg/visitor/printer" + "github.com/laytan/php-parser/pkg/token" + "github.com/laytan/php-parser/pkg/visitor/formatter" + "github.com/laytan/php-parser/pkg/visitor/printer" "testing" - "github.com/VKCOM/php-parser/pkg/ast" + "github.com/laytan/php-parser/pkg/ast" ) func TestFormatter_Root(t *testing.T) { diff --git a/pkg/visitor/nsresolver/namespace_resolver.go b/pkg/visitor/nsresolver/namespace_resolver.go index c83298f..59fccc2 100644 --- a/pkg/visitor/nsresolver/namespace_resolver.go +++ b/pkg/visitor/nsresolver/namespace_resolver.go @@ -5,8 +5,8 @@ import ( "errors" "strings" - "github.com/VKCOM/php-parser/pkg/ast" - "github.com/VKCOM/php-parser/pkg/visitor" + "github.com/laytan/php-parser/pkg/ast" + "github.com/laytan/php-parser/pkg/visitor" ) // NamespaceResolver visitor diff --git a/pkg/visitor/nsresolver/namespace_resolver_test.go b/pkg/visitor/nsresolver/namespace_resolver_test.go index b4c26a2..a2fa52d 100644 --- a/pkg/visitor/nsresolver/namespace_resolver_test.go +++ b/pkg/visitor/nsresolver/namespace_resolver_test.go @@ -1,13 +1,13 @@ package nsresolver_test import ( - "github.com/VKCOM/php-parser/pkg/visitor/nsresolver" - "github.com/VKCOM/php-parser/pkg/visitor/traverser" + "github.com/laytan/php-parser/pkg/visitor/nsresolver" + "github.com/laytan/php-parser/pkg/visitor/traverser" "testing" "gotest.tools/assert" - "github.com/VKCOM/php-parser/pkg/ast" + "github.com/laytan/php-parser/pkg/ast" ) func TestResolveStaticCall(t *testing.T) { diff --git a/pkg/visitor/null.go b/pkg/visitor/null.go index 38c256a..b3b679e 100644 --- a/pkg/visitor/null.go +++ b/pkg/visitor/null.go @@ -1,7 +1,7 @@ package visitor import ( - "github.com/VKCOM/php-parser/pkg/ast" + "github.com/laytan/php-parser/pkg/ast" ) type Null struct{} diff --git a/pkg/visitor/printer/printer.go b/pkg/visitor/printer/printer.go index 23bfd90..31f3999 100644 --- a/pkg/visitor/printer/printer.go +++ b/pkg/visitor/printer/printer.go @@ -4,8 +4,8 @@ import ( "bytes" "io" - "github.com/VKCOM/php-parser/pkg/ast" - "github.com/VKCOM/php-parser/pkg/token" + "github.com/laytan/php-parser/pkg/ast" + "github.com/laytan/php-parser/pkg/token" ) type printerState int diff --git a/pkg/visitor/printer/printer_php7_test.go b/pkg/visitor/printer/printer_php7_test.go index 5c9ae16..4ad0fe7 100644 --- a/pkg/visitor/printer/printer_php7_test.go +++ b/pkg/visitor/printer/printer_php7_test.go @@ -5,11 +5,11 @@ import ( "os" "testing" - "github.com/VKCOM/php-parser/internal/php7" - "github.com/VKCOM/php-parser/pkg/ast" - "github.com/VKCOM/php-parser/pkg/conf" - "github.com/VKCOM/php-parser/pkg/version" - "github.com/VKCOM/php-parser/pkg/visitor/printer" + "github.com/laytan/php-parser/internal/php7" + "github.com/laytan/php-parser/pkg/ast" + "github.com/laytan/php-parser/pkg/conf" + "github.com/laytan/php-parser/pkg/version" + "github.com/laytan/php-parser/pkg/visitor/printer" ) func ExamplePrinter() { diff --git a/pkg/visitor/printer/printer_php8_1_test.go b/pkg/visitor/printer/printer_php8_1_test.go index 47889f7..fee0494 100644 --- a/pkg/visitor/printer/printer_php8_1_test.go +++ b/pkg/visitor/printer/printer_php8_1_test.go @@ -3,7 +3,7 @@ package printer_test import ( "testing" - "github.com/VKCOM/php-parser/internal/tester" + "github.com/laytan/php-parser/internal/tester" ) func TestParseAndPrintReadonlyModifierPHP81(t *testing.T) { diff --git a/pkg/visitor/printer/printer_php8_test.go b/pkg/visitor/printer/printer_php8_test.go index 04eed71..f19d71f 100644 --- a/pkg/visitor/printer/printer_php8_test.go +++ b/pkg/visitor/printer/printer_php8_test.go @@ -5,12 +5,12 @@ import ( "os" "testing" - "github.com/VKCOM/php-parser/internal/php8" - "github.com/VKCOM/php-parser/internal/tester" - "github.com/VKCOM/php-parser/pkg/ast" - "github.com/VKCOM/php-parser/pkg/conf" - "github.com/VKCOM/php-parser/pkg/version" - "github.com/VKCOM/php-parser/pkg/visitor/printer" + "github.com/laytan/php-parser/internal/php8" + "github.com/laytan/php-parser/internal/tester" + "github.com/laytan/php-parser/pkg/ast" + "github.com/laytan/php-parser/pkg/conf" + "github.com/laytan/php-parser/pkg/version" + "github.com/laytan/php-parser/pkg/visitor/printer" "gotest.tools/assert" ) diff --git a/pkg/visitor/printer/printer_test.go b/pkg/visitor/printer/printer_test.go index 677c530..cac200b 100644 --- a/pkg/visitor/printer/printer_test.go +++ b/pkg/visitor/printer/printer_test.go @@ -2,11 +2,11 @@ package printer_test import ( "bytes" - "github.com/VKCOM/php-parser/pkg/token" - "github.com/VKCOM/php-parser/pkg/visitor/printer" + "github.com/laytan/php-parser/pkg/token" + "github.com/laytan/php-parser/pkg/visitor/printer" "testing" - "github.com/VKCOM/php-parser/pkg/ast" + "github.com/laytan/php-parser/pkg/ast" ) func TestPrinterPrintFile(t *testing.T) { diff --git a/pkg/visitor/traverser/traverser.go b/pkg/visitor/traverser/traverser.go index 093511f..30b8ab0 100644 --- a/pkg/visitor/traverser/traverser.go +++ b/pkg/visitor/traverser/traverser.go @@ -1,7 +1,7 @@ package traverser import ( - "github.com/VKCOM/php-parser/pkg/ast" + "github.com/laytan/php-parser/pkg/ast" ) //go:generate go run traverser_gen.go diff --git a/pkg/visitor/traverser/traverser_gen.go b/pkg/visitor/traverser/traverser_gen.go index ab5dc3c..84d5be0 100644 --- a/pkg/visitor/traverser/traverser_gen.go +++ b/pkg/visitor/traverser/traverser_gen.go @@ -10,7 +10,7 @@ import ( "path/filepath" "text/template" - phpast "github.com/VKCOM/php-parser/pkg/ast" + phpast "github.com/laytan/php-parser/pkg/ast" "golang.org/x/tools/go/packages" ) @@ -32,7 +32,7 @@ var fileTempl = template.Must( package traverser -import "github.com/VKCOM/php-parser/pkg/ast" +import "github.com/laytan/php-parser/pkg/ast" {{range $typ := .Types}} func (t *Traverser) {{$typ.FuncName}}(n *ast.{{$typ.Name}}) { if !t.checkEntrance(n) { diff --git a/pkg/visitor/traverser/traverser_impl.go b/pkg/visitor/traverser/traverser_impl.go index c2b6e87..e7522de 100644 --- a/pkg/visitor/traverser/traverser_impl.go +++ b/pkg/visitor/traverser/traverser_impl.go @@ -2,7 +2,7 @@ package traverser -import "github.com/VKCOM/php-parser/pkg/ast" +import "github.com/laytan/php-parser/pkg/ast" func (t *Traverser) Root(n *ast.Root) { if !t.checkEntrance(n) { diff --git a/pkg/visitor/traverser/traverser_test.go b/pkg/visitor/traverser/traverser_test.go index 453505c..f628035 100644 --- a/pkg/visitor/traverser/traverser_test.go +++ b/pkg/visitor/traverser/traverser_test.go @@ -3,9 +3,9 @@ package traverser_test import ( "testing" - "github.com/VKCOM/php-parser/pkg/ast" - "github.com/VKCOM/php-parser/pkg/visitor" - "github.com/VKCOM/php-parser/pkg/visitor/traverser" + "github.com/laytan/php-parser/pkg/ast" + "github.com/laytan/php-parser/pkg/visitor" + "github.com/laytan/php-parser/pkg/visitor/traverser" ) // testCase is a traverser that does not go into any class statement or its children.