Skip to content

Commit 10cbf24

Browse files
authored
Merge pull request #231 from gofiber/codex/2025-11-29-16-42-19
2 parents 76a5764 + 07f5991 commit 10cbf24

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

cmd/internal/migrations/v3/generic_helpers.go

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,18 @@ func MigrateGenericHelpers(cmd *cobra.Command, cwd string, _, _ *semver.Version)
2121
reQueryFloat := regexp.MustCompile(`(\w+)\.QueryFloat\(`)
2222
reQueryBool := regexp.MustCompile(`(\w+)\.QueryBool\(`)
2323
changed, err := internal.ChangeFileContent(cwd, func(content string) string {
24-
content = reParamsIntAssign.ReplaceAllString(content, "$1, $2 := fiber.Params[int]($3, $4), nil")
25-
content = reQueryIntAssign.ReplaceAllString(content, "$1, $2 := fiber.Query[int]($3, $4), nil")
26-
content = reQueryFloatAssign.ReplaceAllString(content, "$1, $2 := fiber.Query[float64]($3, $4), nil")
27-
content = reQueryBoolAssign.ReplaceAllString(content, "$1, $2 := fiber.Query[bool]($3, $4), nil")
24+
assignReplacements := []struct {
25+
re *regexp.Regexp
26+
repl string
27+
}{
28+
{reParamsIntAssign, "$1, $2 := fiber.Params[int]($3, $4), error(nil)"},
29+
{reQueryIntAssign, "$1, $2 := fiber.Query[int]($3, $4), error(nil)"},
30+
{reQueryFloatAssign, "$1, $2 := fiber.Query[float64]($3, $4), error(nil)"},
31+
{reQueryBoolAssign, "$1, $2 := fiber.Query[bool]($3, $4), error(nil)"},
32+
}
33+
for _, r := range assignReplacements {
34+
content = r.re.ReplaceAllString(content, r.repl)
35+
}
2836

2937
content = reParamsInt.ReplaceAllString(content, "fiber.Params[int]($1, ")
3038
content = reQueryInt.ReplaceAllString(content, "fiber.Query[int]($1, ")

cmd/internal/migrations/v3/generic_helpers_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ func handler(c fiber.Ctx) error {
4040
require.NoError(t, v3.MigrateGenericHelpers(cmd, dir, nil, nil))
4141

4242
content := readFile(t, file)
43-
assert.Contains(t, content, "targetedUserID, err := fiber.Params[int](c, \"userID\"), nil")
44-
assert.Contains(t, content, "targetedAge, err2 := fiber.Query[int](c, \"age\"), nil")
43+
assert.Contains(t, content, "targetedUserID, err := fiber.Params[int](c, \"userID\"), error(nil)")
44+
assert.Contains(t, content, "targetedAge, err2 := fiber.Query[int](c, \"age\"), error(nil)")
4545
assert.Contains(t, content, "fiber.Params[int](c, \"id\"")
4646
assert.Contains(t, content, "fiber.Query[int](c, \"level\"")
4747
assert.Contains(t, content, "fiber.Query[float64](c, \"score\"")

0 commit comments

Comments
 (0)