diff --git a/_benchmarks/view/ace/main.go b/_benchmarks/view/ace/main.go index 4bd1bf10..2b48bf1e 100644 --- a/_benchmarks/view/ace/main.go +++ b/_benchmarks/view/ace/main.go @@ -1,6 +1,10 @@ package main -import "github.com/kataras/iris/v12" +import ( + "fmt" + + "github.com/kataras/iris/v12" +) func main() { app := iris.New() @@ -21,7 +25,7 @@ func index(ctx iris.Context) { ctx.ViewLayout("layouts/main") if err := ctx.View("index", data); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } diff --git a/_benchmarks/view/blocks/main.go b/_benchmarks/view/blocks/main.go index 62b86b4c..0f9a8d83 100644 --- a/_benchmarks/view/blocks/main.go +++ b/_benchmarks/view/blocks/main.go @@ -1,6 +1,10 @@ package main -import "github.com/kataras/iris/v12" +import ( + "fmt" + + "github.com/kataras/iris/v12" +) func main() { app := iris.New() @@ -23,7 +27,7 @@ func index(ctx iris.Context) { ctx.ViewLayout("main") if err := ctx.View("index", data); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } diff --git a/_benchmarks/view/django/main.go b/_benchmarks/view/django/main.go index ad6cc034..dc18a90f 100644 --- a/_benchmarks/view/django/main.go +++ b/_benchmarks/view/django/main.go @@ -1,6 +1,10 @@ package main -import "github.com/kataras/iris/v12" +import ( + "fmt" + + "github.com/kataras/iris/v12" +) func main() { app := iris.New() @@ -22,7 +26,7 @@ func index(ctx iris.Context) { // Layouts are only rendered from inside the index page itself // using the "extends" keyword. if err := ctx.View("index", data); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } diff --git a/_benchmarks/view/handlebars/main.go b/_benchmarks/view/handlebars/main.go index 70daefe5..f5773b6b 100644 --- a/_benchmarks/view/handlebars/main.go +++ b/_benchmarks/view/handlebars/main.go @@ -1,6 +1,10 @@ package main -import "github.com/kataras/iris/v12" +import ( + "fmt" + + "github.com/kataras/iris/v12" +) func main() { app := iris.New() @@ -20,7 +24,7 @@ func index(ctx iris.Context) { ctx.ViewLayout("layouts/main") if err := ctx.View("index", data); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } diff --git a/_benchmarks/view/html/main.go b/_benchmarks/view/html/main.go index 494f1c76..3537ebda 100644 --- a/_benchmarks/view/html/main.go +++ b/_benchmarks/view/html/main.go @@ -1,6 +1,10 @@ package main -import "github.com/kataras/iris/v12" +import ( + "fmt" + + "github.com/kataras/iris/v12" +) func main() { app := iris.New() @@ -21,7 +25,7 @@ func index(ctx iris.Context) { ctx.ViewLayout("layouts/main") if err := ctx.View("index", data); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } diff --git a/_benchmarks/view/jet/main.go b/_benchmarks/view/jet/main.go index aa28cdf6..8b3a7a44 100644 --- a/_benchmarks/view/jet/main.go +++ b/_benchmarks/view/jet/main.go @@ -1,6 +1,10 @@ package main -import "github.com/kataras/iris/v12" +import ( + "fmt" + + "github.com/kataras/iris/v12" +) func main() { app := iris.New() @@ -22,7 +26,7 @@ func index(ctx iris.Context) { // Layouts are only rendered from inside the index page itself // using the "extends" keyword. if err := ctx.View("index", data); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } diff --git a/_benchmarks/view/pug/main.go b/_benchmarks/view/pug/main.go index aa1affca..94feb553 100644 --- a/_benchmarks/view/pug/main.go +++ b/_benchmarks/view/pug/main.go @@ -1,6 +1,10 @@ package main -import "github.com/kataras/iris/v12" +import ( + "fmt" + + "github.com/kataras/iris/v12" +) func main() { app := iris.New() @@ -23,7 +27,7 @@ func index(ctx iris.Context) { // Layouts are only rendered from inside the index page itself // using the "extends" keyword. if err := ctx.View("index", data); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } diff --git a/_examples/auth/auth/main.go b/_examples/auth/auth/main.go index 4858eee1..a415d7aa 100644 --- a/_examples/auth/auth/main.go +++ b/_examples/auth/auth/main.go @@ -119,7 +119,7 @@ func main() { func renderSigninForm(ctx iris.Context) { if err := ctx.View("signin", iris.Map{"Title": "Signin Page"}); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } diff --git a/_examples/auth/goth/main.go b/_examples/auth/goth/main.go index 0a188cfb..3292f51c 100644 --- a/_examples/auth/goth/main.go +++ b/_examples/auth/goth/main.go @@ -21,6 +21,7 @@ package main // are fixed in the time I wrote that example, have fun! import ( "errors" + "fmt" "os" "sort" @@ -380,7 +381,7 @@ func main() { if err := ctx.View("user.html", iris.Map{ "user": user, }); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } }) @@ -399,14 +400,14 @@ func main() { } if err := ctx.View("user.html", gothUser); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } }) app.Get("/", func(ctx iris.Context) { if err := ctx.View("index.html", providerIndex); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } }) diff --git a/_examples/auth/hcaptcha/main.go b/_examples/auth/hcaptcha/main.go index 7d4e9298..16d40f74 100644 --- a/_examples/auth/hcaptcha/main.go +++ b/_examples/auth/hcaptcha/main.go @@ -1,6 +1,7 @@ package main import ( + "fmt" "os" "github.com/kataras/iris/v12" @@ -43,7 +44,7 @@ func register(ctx iris.Context) { func registerForm(ctx iris.Context) { ctx.ViewData("SiteKey", siteKey) if err := ctx.View("register_form.html"); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } diff --git a/_examples/bootstrapper/bootstrap/bootstrapper.go b/_examples/bootstrapper/bootstrap/bootstrapper.go index 4b2ddbf2..8474d92e 100644 --- a/_examples/bootstrapper/bootstrap/bootstrapper.go +++ b/_examples/bootstrapper/bootstrap/bootstrapper.go @@ -1,6 +1,7 @@ package bootstrap import ( + "fmt" "time" "github.com/gorilla/securecookie" @@ -78,7 +79,7 @@ func (b *Bootstrapper) SetupErrorHandlers() { ctx.ViewData("Err", err) ctx.ViewData("Title", "Error") if err := ctx.View("shared/error.html"); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } }) diff --git a/_examples/bootstrapper/routes/index.go b/_examples/bootstrapper/routes/index.go index 5a314044..7167465f 100644 --- a/_examples/bootstrapper/routes/index.go +++ b/_examples/bootstrapper/routes/index.go @@ -1,6 +1,8 @@ package routes import ( + "fmt" + "github.com/kataras/iris/v12" ) @@ -8,7 +10,7 @@ import ( func GetIndexHandler(ctx iris.Context) { ctx.ViewData("Title", "Index Page") if err := ctx.View("index.html"); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } diff --git a/_examples/dropzonejs/README.md b/_examples/dropzonejs/README.md index 0e6c6ac9..411e6945 100644 --- a/_examples/dropzonejs/README.md +++ b/_examples/dropzonejs/README.md @@ -107,7 +107,7 @@ func main() { // GET: http://localhost:8080 app.Get("/", func(ctx iris.Context) { if err := ctx.View("upload.html"); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } }) diff --git a/_examples/dropzonejs/README_PART2.md b/_examples/dropzonejs/README_PART2.md index 437d6955..8f83e32f 100644 --- a/_examples/dropzonejs/README_PART2.md +++ b/_examples/dropzonejs/README_PART2.md @@ -172,7 +172,7 @@ func main() { app.Get("/", func(ctx iris.Context) { if err := ctx.View("upload.html"); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } }) diff --git a/_examples/dropzonejs/src/main.go b/_examples/dropzonejs/src/main.go index 56edf24c..84ad2c88 100644 --- a/_examples/dropzonejs/src/main.go +++ b/_examples/dropzonejs/src/main.go @@ -1,6 +1,7 @@ package main import ( + "fmt" "image/jpeg" "image/png" "io" @@ -125,7 +126,7 @@ func main() { app.Get("/", func(ctx iris.Context) { if err := ctx.View("upload.html"); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } }) diff --git a/_examples/file-server/file-server/main.go b/_examples/file-server/file-server/main.go index a49f73e1..dbf03312 100644 --- a/_examples/file-server/file-server/main.go +++ b/_examples/file-server/file-server/main.go @@ -95,7 +95,7 @@ func uploadView(ctx iris.Context) { token := fmt.Sprintf("%x", h.Sum(nil)) if err := ctx.View("upload.html", token); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } diff --git a/_examples/file-server/single-page-application/embedded-single-page-application/main.go b/_examples/file-server/single-page-application/embedded-single-page-application/main.go index 3e0f65d7..d00ecae9 100644 --- a/_examples/file-server/single-page-application/embedded-single-page-application/main.go +++ b/_examples/file-server/single-page-application/embedded-single-page-application/main.go @@ -1,6 +1,8 @@ package main import ( + "fmt" + "github.com/kataras/iris/v12" ) @@ -27,7 +29,7 @@ func newApp() *iris.Application { app.Get("/", func(ctx iris.Context) { ctx.ViewData("Page", page) if err := ctx.View("index.html"); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } }) diff --git a/_examples/file-server/spa-vue-router/main.go b/_examples/file-server/spa-vue-router/main.go index 680f2be2..b2852dde 100644 --- a/_examples/file-server/spa-vue-router/main.go +++ b/_examples/file-server/spa-vue-router/main.go @@ -28,7 +28,7 @@ func fullVueRouter() { func index(ctx iris.Context) { if err := ctx.View("index.html"); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } diff --git a/_examples/file-server/upload-file/main.go b/_examples/file-server/upload-file/main.go index ccec044e..04bf5d39 100644 --- a/_examples/file-server/upload-file/main.go +++ b/_examples/file-server/upload-file/main.go @@ -32,7 +32,7 @@ func main() { // or add second argument to the `View` method. // Token will be passed as {{.}} in the template. if err := ctx.View("upload_form.html", token); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } }) diff --git a/_examples/file-server/upload-files/main.go b/_examples/file-server/upload-files/main.go index 8a9e1cf1..ee310cae 100644 --- a/_examples/file-server/upload-files/main.go +++ b/_examples/file-server/upload-files/main.go @@ -33,7 +33,7 @@ func newApp() *iris.Application { // render the form with the token for any use you'd like. if err := ctx.View("upload_form.html", token); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } }) diff --git a/_examples/i18n/basic/main.go b/_examples/i18n/basic/main.go index 6bdd77c7..c00d8d76 100644 --- a/_examples/i18n/basic/main.go +++ b/_examples/i18n/basic/main.go @@ -87,7 +87,7 @@ func newApp() *iris.Application { return template.HTML(ctx.Tr(message, args...)) }, }); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } diff --git a/_examples/logging/request-logger/accesslog-broker/main.go b/_examples/logging/request-logger/accesslog-broker/main.go index 7709153c..cd3416b2 100644 --- a/_examples/logging/request-logger/accesslog-broker/main.go +++ b/_examples/logging/request-logger/accesslog-broker/main.go @@ -1,6 +1,7 @@ package main import ( + "fmt" "os" "github.com/kataras/iris/v12" @@ -62,7 +63,7 @@ func notFoundHandler(ctx iris.Context) { ctx.HTML("Did you mean?") } @@ -73,7 +74,7 @@ func indexHandler(ctx iris.Context) { func profileHandler(ctx iris.Context) { username := ctx.Params().Get("username") - ctx.HTML("Hello, %s!", username) + ctx.HTML(fmt.Sprintf("Hello, %s!", username)) } func readBodyHandler(ctx iris.Context) { diff --git a/_examples/mvc/login/main.go b/_examples/mvc/login/main.go index ebda0367..f7df381a 100644 --- a/_examples/mvc/login/main.go +++ b/_examples/mvc/login/main.go @@ -3,6 +3,7 @@ package main import ( + "fmt" "time" "github.com/kataras/iris/v12/_examples/mvc/login/datasource" @@ -34,7 +35,7 @@ func main() { ctx.ViewData("Message", ctx.Values(). GetStringDefault("message", "The page you're looking for doesn't exist")) if err := ctx.View("shared/error.html"); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } }) diff --git a/_examples/mvc/websocket-auth/main.go b/_examples/mvc/websocket-auth/main.go index 8dcd0cf9..7d1916b1 100644 --- a/_examples/mvc/websocket-auth/main.go +++ b/_examples/mvc/websocket-auth/main.go @@ -52,7 +52,7 @@ func newApp() *iris.Application { func renderSigninForm(ctx iris.Context) { if err := ctx.View("signin", iris.Map{"Title": "Signin Page"}); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } diff --git a/_examples/request-body/read-form/checkboxes/main.go b/_examples/request-body/read-form/checkboxes/main.go index 4007fbf0..81b54ea3 100644 --- a/_examples/request-body/read-form/checkboxes/main.go +++ b/_examples/request-body/read-form/checkboxes/main.go @@ -1,6 +1,10 @@ package main -import "github.com/kataras/iris/v12" +import ( + "fmt" + + "github.com/kataras/iris/v12" +) func main() { app := iris.New() @@ -14,7 +18,7 @@ func main() { func showForm(ctx iris.Context) { if err := ctx.View("form.html"); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } diff --git a/_examples/request-body/read-form/main.go b/_examples/request-body/read-form/main.go index 942a2378..940722f9 100644 --- a/_examples/request-body/read-form/main.go +++ b/_examples/request-body/read-form/main.go @@ -2,6 +2,8 @@ package main import ( + "fmt" + "github.com/kataras/iris/v12" ) @@ -19,7 +21,7 @@ func main() { app.Get("/", func(ctx iris.Context) { if err := ctx.View("form.html"); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } }) diff --git a/_examples/response-writer/http2push/main.go b/_examples/response-writer/http2push/main.go index f6b9f4d9..c968f3c1 100644 --- a/_examples/response-writer/http2push/main.go +++ b/_examples/response-writer/http2push/main.go @@ -5,6 +5,7 @@ package main import ( + "fmt" "net/http" "github.com/kataras/iris/v12" @@ -39,7 +40,7 @@ func pushHandler(ctx iris.Context) { } } - ctx.HTML(``, target) + ctx.HTML(fmt.Sprintf(``, target)) } func simpleAssetHandler(ctx iris.Context) { diff --git a/_examples/routing/custom-context/main.go b/_examples/routing/custom-context/main.go index 6148325d..5254fbcf 100644 --- a/_examples/routing/custom-context/main.go +++ b/_examples/routing/custom-context/main.go @@ -1,6 +1,7 @@ package main import ( + "fmt" "sync" "github.com/kataras/iris/v12" @@ -82,5 +83,5 @@ func (c *myCustomContext) SetContext(ctx iris.Context) { func (c *myCustomContext) HTML(format string, args ...interface{}) (int, error) { c.Application().Logger().Info("HTML was called from custom Context") - return c.Context.HTML(format, args...) + return c.Context.HTML(fmt.Sprintf(format, args...)) } diff --git a/_examples/routing/http-wire-errors/main.go b/_examples/routing/http-wire-errors/main.go index 1f5001e5..5c197d7c 100644 --- a/_examples/routing/http-wire-errors/main.go +++ b/_examples/routing/http-wire-errors/main.go @@ -1,6 +1,8 @@ package main import ( + "fmt" + "github.com/kataras/iris/v12" // IMPORTANT, import this sub-package. // Note tht it does NOT break compatibility with the @@ -49,7 +51,7 @@ func main() { } func fireCustomErrorCodeName(ctx iris.Context) { - Custom.Details(ctx, "message", "details with arguments: %s", "an argument") + Custom.Details(ctx, "message", fmt.Sprintf("details with arguments: %s", "an argument")) } func fireInvalidArgument(ctx iris.Context) { diff --git a/_examples/routing/intelligence/manual/main.go b/_examples/routing/intelligence/manual/main.go index b2bfb5a8..f6de37f0 100644 --- a/_examples/routing/intelligence/manual/main.go +++ b/_examples/routing/intelligence/manual/main.go @@ -1,6 +1,10 @@ package main -import "github.com/kataras/iris/v12" +import ( + "fmt" + + "github.com/kataras/iris/v12" +) func main() { app := iris.New() @@ -27,7 +31,7 @@ func notFound(ctx iris.Context) { ctx.HTML("Did you mean?") } diff --git a/_examples/routing/main.go b/_examples/routing/main.go index 5dd843c0..6e492128 100644 --- a/_examples/routing/main.go +++ b/_examples/routing/main.go @@ -111,7 +111,7 @@ func newApp() *iris.Application { // if is larger then send a bad request status if err != nil { ctx.StatusCode(iris.StatusBadRequest) - ctx.Writef(err.Error()) + ctx.WriteString(err.Error()) return } // send back the post body diff --git a/_examples/routing/overview-2/main.go b/_examples/routing/overview-2/main.go index c4b2e29b..f8253ec6 100644 --- a/_examples/routing/overview-2/main.go +++ b/_examples/routing/overview-2/main.go @@ -1,6 +1,8 @@ package main import ( + "fmt" + "github.com/kataras/iris/v12" ) @@ -77,7 +79,7 @@ func main() { app.Get("/", func(ctx iris.Context) { ctx.HTML("") }) @@ -101,7 +103,7 @@ func profileByUsername(ctx iris.Context) { // renders "./views/user/profile.html" // with {{ .Username }} equals to the username dynamic path parameter. if err := ctx.View("user/profile.html"); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } @@ -126,7 +128,7 @@ func createUser(ctx iris.Context) { // with {{ . }} equals to the User object, i.e {{ .Username }} , {{ .Firstname}} etc... ctx.ViewData("", user) if err := ctx.View("user/create_verification.html"); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } diff --git a/_examples/routing/overview/main.go b/_examples/routing/overview/main.go index 0c42bfcd..871bd365 100644 --- a/_examples/routing/overview/main.go +++ b/_examples/routing/overview/main.go @@ -123,7 +123,7 @@ func main() { app.Delete("/something", func(ctx iris.Context) { name := ctx.URLParam("name") - ctx.Writef(name) + ctx.WriteString(name) }) app.None("/secret", privateHandler) diff --git a/_examples/routing/subdomains/http-errors-view/main.go b/_examples/routing/subdomains/http-errors-view/main.go index 34fe93e4..0995b193 100644 --- a/_examples/routing/subdomains/http-errors-view/main.go +++ b/_examples/routing/subdomains/http-errors-view/main.go @@ -1,6 +1,10 @@ package main -import "github.com/kataras/iris/v12" +import ( + "fmt" + + "github.com/kataras/iris/v12" +) func main() { newApp().Listen("mydomain.com:80", iris.WithLogLevel("debug")) @@ -31,7 +35,7 @@ func handleNotFoundTestSubdomain(ctx iris.Context) { if err := ctx.View("error.html", iris.Map{ "ErrorCode": ctx.GetStatusCode(), }); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } diff --git a/_examples/routing/versioning/main.go b/_examples/routing/versioning/main.go index 052a87a3..e38badcb 100644 --- a/_examples/routing/versioning/main.go +++ b/_examples/routing/versioning/main.go @@ -1,6 +1,8 @@ package main import ( + "fmt" + "github.com/kataras/iris/v12" "github.com/kataras/iris/v12/versioning" ) @@ -99,7 +101,7 @@ func testError(v string) iris.Handler { func testView(ctx iris.Context) { if err := ctx.View("index.html"); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } diff --git a/_examples/sessions/overview/example/example.go b/_examples/sessions/overview/example/example.go index 48c349c3..96437303 100644 --- a/_examples/sessions/overview/example/example.go +++ b/_examples/sessions/overview/example/example.go @@ -2,6 +2,7 @@ package example import ( "errors" + "fmt" "github.com/kataras/iris/v12" "github.com/kataras/iris/v12/sessions" @@ -27,7 +28,7 @@ func NewApp(sess *sessions.Sessions) *iris.Application { ctx.HTML("") diff --git a/_examples/sessions/viewdata/main.go b/_examples/sessions/viewdata/main.go index e20424b0..b0bd3e83 100644 --- a/_examples/sessions/viewdata/main.go +++ b/_examples/sessions/viewdata/main.go @@ -1,6 +1,8 @@ package main import ( + "fmt" + "github.com/kataras/iris/v12" "github.com/kataras/iris/v12/sessions" ) @@ -30,7 +32,7 @@ func index(ctx iris.Context) { session := sessions.Get(ctx) session.Set("username", "kataras") if err := ctx.View("index"); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } /* OR without middleware: diff --git a/_examples/url-shortener/main.go b/_examples/url-shortener/main.go index ac10db8d..6145a0d3 100644 --- a/_examples/url-shortener/main.go +++ b/_examples/url-shortener/main.go @@ -10,6 +10,7 @@ package main import ( + "fmt" "html/template" "github.com/kataras/iris/v12" @@ -51,7 +52,7 @@ func newApp(db *DB) *iris.Application { indexHandler := func(ctx iris.Context) { ctx.ViewData("URL_COUNT", db.Len()) if err := ctx.View("index.html"); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } diff --git a/_examples/view/context-view-engine/main.go b/_examples/view/context-view-engine/main.go index 22ee15ef..d82e5339 100644 --- a/_examples/view/context-view-engine/main.go +++ b/_examples/view/context-view-engine/main.go @@ -1,6 +1,10 @@ package main -import "github.com/kataras/iris/v12" +import ( + "fmt" + + "github.com/kataras/iris/v12" +) func main() { app := iris.New() @@ -38,7 +42,7 @@ func index(ctx iris.Context) { ctx.ViewLayout("main") if err := ctx.View("index", data); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } @@ -50,7 +54,7 @@ func admin(ctx iris.Context) { ctx.ViewLayout("main") if err := ctx.View("index", data); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } @@ -68,7 +72,7 @@ func onFly(ctx iris.Context) { } if err := ctx.View("index", data); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } diff --git a/_examples/view/embedding-templates-into-app-bindata/main.go b/_examples/view/embedding-templates-into-app-bindata/main.go index fbecfdda..50dca7e7 100644 --- a/_examples/view/embedding-templates-into-app-bindata/main.go +++ b/_examples/view/embedding-templates-into-app-bindata/main.go @@ -1,6 +1,10 @@ package main -import "github.com/kataras/iris/v12" +import ( + "fmt" + + "github.com/kataras/iris/v12" +) func main() { app := iris.New() @@ -20,7 +24,7 @@ func main() { app.Get("/", func(ctx iris.Context) { if err := ctx.View("page1.html"); err != nil { ctx.StatusCode(iris.StatusInternalServerError) - ctx.Writef(err.Error()) + ctx.WriteString(err.Error()) } }) @@ -29,7 +33,7 @@ func main() { ctx.ViewLayout(iris.NoLayout) if err := ctx.View("page1.html"); err != nil { ctx.StatusCode(iris.StatusInternalServerError) - ctx.Writef(err.Error()) + ctx.WriteString(err.Error()) } }) @@ -38,13 +42,13 @@ func main() { { // both of these will use the layouts/mylayout.html as their layout. my.Get("/", func(ctx iris.Context) { if err := ctx.View("page1.html"); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } }) my.Get("/other", func(ctx iris.Context) { if err := ctx.View("page1.html"); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } }) diff --git a/_examples/view/embedding-templates-into-app/main.go b/_examples/view/embedding-templates-into-app/main.go index b6f5d2ca..1914a0ab 100644 --- a/_examples/view/embedding-templates-into-app/main.go +++ b/_examples/view/embedding-templates-into-app/main.go @@ -2,6 +2,7 @@ package main import ( "embed" + "fmt" "github.com/kataras/iris/v12" ) @@ -23,7 +24,7 @@ func main() { app.Get("/", func(ctx iris.Context) { if err := ctx.View("page1.html"); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } }) @@ -32,7 +33,7 @@ func main() { app.Get("/nolayout", func(ctx iris.Context) { ctx.ViewLayout(iris.NoLayout) if err := ctx.View("page1.html"); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } }) @@ -42,13 +43,13 @@ func main() { { // both of these will use the layouts/mylayout.html as their layout. my.Get("/", func(ctx iris.Context) { if err := ctx.View("page1.html"); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } }) my.Get("/other", func(ctx iris.Context) { if err := ctx.View("page1.html"); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } }) diff --git a/_examples/view/fallback/main.go b/_examples/view/fallback/main.go index 067744b7..47d77137 100644 --- a/_examples/view/fallback/main.go +++ b/_examples/view/fallback/main.go @@ -1,6 +1,10 @@ package main -import "github.com/kataras/iris/v12" +import ( + "fmt" + + "github.com/kataras/iris/v12" +) func main() { app := iris.New() @@ -39,7 +43,7 @@ func main() { func index(ctx iris.Context) { if err := ctx.View("blabla.html"); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } diff --git a/_examples/view/layout/ace/main.go b/_examples/view/layout/ace/main.go index e3d05eef..80c12346 100644 --- a/_examples/view/layout/ace/main.go +++ b/_examples/view/layout/ace/main.go @@ -1,6 +1,10 @@ package main -import "github.com/kataras/iris/v12" +import ( + "fmt" + + "github.com/kataras/iris/v12" +) func main() { app := iris.New() @@ -23,7 +27,7 @@ func index(ctx iris.Context) { ctx.ViewLayout("layouts/main") if err := ctx.View("index", data); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } diff --git a/_examples/view/layout/blocks/main.go b/_examples/view/layout/blocks/main.go index f65155fb..6c8b0a31 100644 --- a/_examples/view/layout/blocks/main.go +++ b/_examples/view/layout/blocks/main.go @@ -1,6 +1,10 @@ package main -import "github.com/kataras/iris/v12" +import ( + "fmt" + + "github.com/kataras/iris/v12" +) func main() { app := iris.New() @@ -24,7 +28,7 @@ func index(ctx iris.Context) { ctx.ViewLayout("main") if err := ctx.View("index", data); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } diff --git a/_examples/view/layout/django/main.go b/_examples/view/layout/django/main.go index ad6cc034..dc18a90f 100644 --- a/_examples/view/layout/django/main.go +++ b/_examples/view/layout/django/main.go @@ -1,6 +1,10 @@ package main -import "github.com/kataras/iris/v12" +import ( + "fmt" + + "github.com/kataras/iris/v12" +) func main() { app := iris.New() @@ -22,7 +26,7 @@ func index(ctx iris.Context) { // Layouts are only rendered from inside the index page itself // using the "extends" keyword. if err := ctx.View("index", data); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } diff --git a/_examples/view/layout/handlebars/main.go b/_examples/view/layout/handlebars/main.go index 7b62c7b8..641ef7fb 100644 --- a/_examples/view/layout/handlebars/main.go +++ b/_examples/view/layout/handlebars/main.go @@ -1,6 +1,10 @@ package main -import "github.com/kataras/iris/v12" +import ( + "fmt" + + "github.com/kataras/iris/v12" +) func main() { app := iris.New() @@ -21,7 +25,7 @@ func index(ctx iris.Context) { ctx.ViewLayout("layouts/main") if err := ctx.View("index", data); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } diff --git a/_examples/view/layout/html/main.go b/_examples/view/layout/html/main.go index 494f1c76..3537ebda 100644 --- a/_examples/view/layout/html/main.go +++ b/_examples/view/layout/html/main.go @@ -1,6 +1,10 @@ package main -import "github.com/kataras/iris/v12" +import ( + "fmt" + + "github.com/kataras/iris/v12" +) func main() { app := iris.New() @@ -21,7 +25,7 @@ func index(ctx iris.Context) { ctx.ViewLayout("layouts/main") if err := ctx.View("index", data); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } diff --git a/_examples/view/layout/jet/main.go b/_examples/view/layout/jet/main.go index 075266b3..41de5551 100644 --- a/_examples/view/layout/jet/main.go +++ b/_examples/view/layout/jet/main.go @@ -1,6 +1,10 @@ package main -import "github.com/kataras/iris/v12" +import ( + "fmt" + + "github.com/kataras/iris/v12" +) func main() { app := iris.New() @@ -23,7 +27,7 @@ func index(ctx iris.Context) { // Layouts are only rendered from inside the index page itself // using the "extends" keyword. if err := ctx.View("index", data); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } diff --git a/_examples/view/layout/pug/main.go b/_examples/view/layout/pug/main.go index 4432545f..4700c60b 100644 --- a/_examples/view/layout/pug/main.go +++ b/_examples/view/layout/pug/main.go @@ -1,6 +1,10 @@ package main -import "github.com/kataras/iris/v12" +import ( + "fmt" + + "github.com/kataras/iris/v12" +) func main() { app := iris.New() @@ -22,7 +26,7 @@ func index(ctx iris.Context) { // Layouts are only rendered from inside the index page itself // using the "extends" keyword. if err := ctx.View("index", data); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } diff --git a/_examples/view/overview/main.go b/_examples/view/overview/main.go index bd50af31..91568fb8 100644 --- a/_examples/view/overview/main.go +++ b/_examples/view/overview/main.go @@ -1,6 +1,7 @@ package main import ( + "fmt" "html/template" "time" @@ -36,7 +37,7 @@ func main() { // render the template with the file name relative to the './templates'. // file extension is OPTIONAL. if err := ctx.View("hi.html"); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } }) @@ -51,7 +52,7 @@ func main() { } if err := ctx.View("example.html", examplePage); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } }) @@ -80,7 +81,7 @@ func main() { } if err := ctx.View("example.html", examplePage); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } }) @@ -97,7 +98,7 @@ func main() { } if err := ctx.View("functions.html", functionsPage); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } }) diff --git a/_examples/view/parse-template/django/main.go b/_examples/view/parse-template/django/main.go index 8fe6c08a..ed00dfa7 100644 --- a/_examples/view/parse-template/django/main.go +++ b/_examples/view/parse-template/django/main.go @@ -1,6 +1,10 @@ package main -import "github.com/kataras/iris/v12" +import ( + "fmt" + + "github.com/kataras/iris/v12" +) func main() { e := iris.Django(nil, ".html") // You can still use a file system though. @@ -24,7 +28,7 @@ func index(ctx iris.Context) { if err := ctx.View("program.html", iris.Map{ "Name": "Gerasimos", }); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } diff --git a/_examples/view/parse-template/handlebars/main.go b/_examples/view/parse-template/handlebars/main.go index 1a6adb09..6e04f498 100644 --- a/_examples/view/parse-template/handlebars/main.go +++ b/_examples/view/parse-template/handlebars/main.go @@ -1,6 +1,10 @@ package main -import "github.com/kataras/iris/v12" +import ( + "fmt" + + "github.com/kataras/iris/v12" +) func main() { e := iris.Handlebars(nil, ".html") // You can still use a file system though. @@ -22,7 +26,7 @@ func index(ctx iris.Context) { if err := ctx.View("program.html", iris.Map{ "Name": "Gerasimos", }); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } diff --git a/_examples/view/parse-template/jet/main.go b/_examples/view/parse-template/jet/main.go index 9b07b32b..def96261 100644 --- a/_examples/view/parse-template/jet/main.go +++ b/_examples/view/parse-template/jet/main.go @@ -1,6 +1,7 @@ package main import ( + "fmt" "reflect" "github.com/kataras/iris/v12" @@ -30,7 +31,7 @@ func index(ctx iris.Context) { if err := ctx.View("program.jet", iris.Map{ "Name": "Gerasimos", }); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } diff --git a/_examples/view/parse-template/main.go b/_examples/view/parse-template/main.go index 8c9bd88e..158eb1eb 100644 --- a/_examples/view/parse-template/main.go +++ b/_examples/view/parse-template/main.go @@ -4,7 +4,11 @@ // template parsers navigate through the example's subdirectories. package main -import "github.com/kataras/iris/v12" +import ( + "fmt" + + "github.com/kataras/iris/v12" +) func main() { // To not load any templates from files or embedded data, @@ -34,7 +38,7 @@ func index(ctx iris.Context) { if err := ctx.View("program.html", iris.Map{ "Name": "Gerasimos", }); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } diff --git a/_examples/view/template_ace_0/main.go b/_examples/view/template_ace_0/main.go index 3e8637a0..c7cd8421 100644 --- a/_examples/view/template_ace_0/main.go +++ b/_examples/view/template_ace_0/main.go @@ -1,6 +1,10 @@ package main -import "github.com/kataras/iris/v12" +import ( + "fmt" + + "github.com/kataras/iris/v12" +) func main() { app := iris.New() @@ -15,7 +19,7 @@ func main() { if err := ctx.View("index", iris.Map{ "Title": "Title of The Page", }); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } }) @@ -25,7 +29,7 @@ func main() { if err := ctx.View("index", iris.Map{ // file extension is optional. "Title": "Title of the main Page", }); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } }) diff --git a/_examples/view/template_blocks_0/main.go b/_examples/view/template_blocks_0/main.go index 8171ffb3..bc2ee74e 100644 --- a/_examples/view/template_blocks_0/main.go +++ b/_examples/view/template_blocks_0/main.go @@ -1,6 +1,10 @@ package main -import "github.com/kataras/iris/v12" +import ( + "fmt" + + "github.com/kataras/iris/v12" +) func main() { app := iris.New() @@ -20,7 +24,7 @@ func index(ctx iris.Context) { ctx.ViewLayout("main") if err := ctx.View("index", data); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } @@ -35,7 +39,7 @@ func internalServerError(ctx iris.Context) { ctx.ViewLayout("error") if err := ctx.View("500", data); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } diff --git a/_examples/view/template_blocks_1_embedded/main.go b/_examples/view/template_blocks_1_embedded/main.go index f036cc81..cb6eb177 100644 --- a/_examples/view/template_blocks_1_embedded/main.go +++ b/_examples/view/template_blocks_1_embedded/main.go @@ -1,6 +1,10 @@ package main -import "github.com/kataras/iris/v12" +import ( + "fmt" + + "github.com/kataras/iris/v12" +) // $ go install github.com/go-bindata/go-bindata/v3/go-bindata@latest // @@ -29,7 +33,7 @@ func index(ctx iris.Context) { ctx.ViewLayout("main") if err := ctx.View("index", data); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } @@ -44,7 +48,7 @@ func internalServerError(ctx iris.Context) { ctx.ViewLayout("error") if err := ctx.View("500", data); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } diff --git a/_examples/view/template_django_0/main.go b/_examples/view/template_django_0/main.go index 91104bbe..79126318 100644 --- a/_examples/view/template_django_0/main.go +++ b/_examples/view/template_django_0/main.go @@ -1,6 +1,7 @@ package main import ( + "fmt" "time" "github.com/kataras/iris/v12" @@ -40,7 +41,7 @@ func hi(ctx iris.Context) { "name": "iris", "serverStartTime": startTime, }); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } diff --git a/_examples/view/template_django_1/main.go b/_examples/view/template_django_1/main.go index cb816352..a8bb4087 100644 --- a/_examples/view/template_django_1/main.go +++ b/_examples/view/template_django_1/main.go @@ -1,6 +1,10 @@ package main -import "github.com/kataras/iris/v12" +import ( + "fmt" + + "github.com/kataras/iris/v12" +) func main() { app := iris.New() @@ -31,7 +35,7 @@ func main() { paramsAsArray := []string{"theParam1", "theParam2", "paramThirdAfterStatic"} ctx.ViewData("ParamsAsArray", paramsAsArray) if err := ctx.View("page.html"); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } }) diff --git a/_examples/view/template_handlebars_0/main.go b/_examples/view/template_handlebars_0/main.go index dac5417d..5e249a3d 100644 --- a/_examples/view/template_handlebars_0/main.go +++ b/_examples/view/template_handlebars_0/main.go @@ -1,6 +1,8 @@ package main import ( + "fmt" + "github.com/kataras/iris/v12" "github.com/kataras/iris/v12/mvc" ) @@ -29,7 +31,7 @@ func main() { } if err := ctx.View("example.html", viewData); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } }) diff --git a/_examples/view/template_html_0/main.go b/_examples/view/template_html_0/main.go index 687adfb7..33a01bc5 100644 --- a/_examples/view/template_html_0/main.go +++ b/_examples/view/template_html_0/main.go @@ -1,6 +1,8 @@ package main import ( + "fmt" + "github.com/kataras/iris/v12" ) @@ -32,7 +34,7 @@ func hi(ctx iris.Context) { ctx.ViewData("Name", "iris") // {{.Name}} will render: iris // ctx.ViewData("", myCcustomStruct{}) if err := ctx.View("hi.html"); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } diff --git a/_examples/view/template_html_1/main.go b/_examples/view/template_html_1/main.go index 26d2e9a5..ed68a902 100644 --- a/_examples/view/template_html_1/main.go +++ b/_examples/view/template_html_1/main.go @@ -1,6 +1,8 @@ package main import ( + "fmt" + "github.com/kataras/iris/v12" ) @@ -19,7 +21,7 @@ func main() { ctx.CompressWriter(true) ctx.ViewData("", mypage{"My Page title", "Hello world!"}) if err := ctx.View("mypage.html"); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } // Note that: you can pass "layout" : "otherLayout.html" to bypass the config's Layout property diff --git a/_examples/view/template_html_2/main.go b/_examples/view/template_html_2/main.go index 6e864223..30548f88 100644 --- a/_examples/view/template_html_2/main.go +++ b/_examples/view/template_html_2/main.go @@ -1,6 +1,8 @@ package main import ( + "fmt" + "github.com/kataras/iris/v12" ) @@ -18,7 +20,7 @@ func main() { app.Get("/", func(ctx iris.Context) { if err := ctx.View("page1.html"); err != nil { ctx.StatusCode(iris.StatusInternalServerError) - ctx.Writef(err.Error()) + ctx.WriteString(err.Error()) } }) @@ -27,7 +29,7 @@ func main() { ctx.ViewLayout(iris.NoLayout) if err := ctx.View("page1.html"); err != nil { ctx.StatusCode(iris.StatusInternalServerError) - ctx.Writef(err.Error()) + ctx.WriteString(err.Error()) } }) @@ -36,13 +38,13 @@ func main() { { // both of these will use the layouts/mylayout.html as their layout. my.Get("/", func(ctx iris.Context) { if err := ctx.View("page1.html"); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } }) my.Get("/other", func(ctx iris.Context) { if err := ctx.View("page1.html"); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } }) diff --git a/_examples/view/template_html_3/main.go b/_examples/view/template_html_3/main.go index 91cc7e75..023cdf7d 100644 --- a/_examples/view/template_html_3/main.go +++ b/_examples/view/template_html_3/main.go @@ -3,6 +3,8 @@ package main import ( + "fmt" + "github.com/kataras/iris/v12" ) @@ -35,7 +37,7 @@ func main() { paramsAsArray := []string{"theParam1", "theParam2", "paramThirdAfterStatic"} ctx.ViewData("ParamsAsArray", paramsAsArray) if err := ctx.View("page.html"); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } }) diff --git a/_examples/view/template_html_4/main.go b/_examples/view/template_html_4/main.go index 6a0ea14e..bd2b78da 100644 --- a/_examples/view/template_html_4/main.go +++ b/_examples/view/template_html_4/main.go @@ -2,6 +2,8 @@ package main import ( + "fmt" + "github.com/kataras/iris/v12" "github.com/kataras/iris/v12/core/router" ) @@ -52,7 +54,7 @@ func main() { paramsAsArray := []string{"username5", "theParam1", "theParam2", "paramThirdAfterStatic"} ctx.ViewData("ParamsAsArray", paramsAsArray) if err := ctx.View("page.html"); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } }) diff --git a/_examples/view/template_html_5/main.go b/_examples/view/template_html_5/main.go index 3727c07d..986ea466 100644 --- a/_examples/view/template_html_5/main.go +++ b/_examples/view/template_html_5/main.go @@ -1,6 +1,8 @@ package main import ( + "fmt" + "github.com/kataras/iris/v12" ) @@ -13,7 +15,7 @@ func main() { app.Get("/home", func(ctx iris.Context) { ctx.ViewData("title", "Home page") if err := ctx.View("home.html"); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } @@ -24,14 +26,14 @@ func main() { app.Get("/about", func(ctx iris.Context) { if err := ctx.View("about.html"); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } }) app.Get("/user/index", func(ctx iris.Context) { if err := ctx.View("user/index.html"); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } }) diff --git a/_examples/view/template_jet_0/main.go b/_examples/view/template_jet_0/main.go index 272b9a1e..d5b965db 100644 --- a/_examples/view/template_jet_0/main.go +++ b/_examples/view/template_jet_0/main.go @@ -114,7 +114,7 @@ func main() { ctx.ViewData("title", "Show TODO") if err := ctx.View("todos/show.jet", todo); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } }) @@ -136,7 +136,7 @@ func main() { // and ctx.View("todos/index.jet") // OR if err := ctx.View("todos/index.jet", (&doneTODOs{}).New(todos)); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } }) diff --git a/_examples/view/template_jet_1_embedded/main.go b/_examples/view/template_jet_1_embedded/main.go index b6595078..ea6a3ace 100644 --- a/_examples/view/template_jet_1_embedded/main.go +++ b/_examples/view/template_jet_1_embedded/main.go @@ -5,6 +5,7 @@ package main import ( + "fmt" "os" "github.com/kataras/iris/v12" @@ -23,7 +24,7 @@ func main() { app.Get("/", func(ctx iris.Context) { if err := ctx.View("index.jet"); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } }) diff --git a/_examples/view/template_jet_2/main.go b/_examples/view/template_jet_2/main.go index d40bf4e5..911cfa30 100644 --- a/_examples/view/template_jet_2/main.go +++ b/_examples/view/template_jet_2/main.go @@ -2,6 +2,8 @@ package main import ( + "fmt" + "github.com/kataras/iris/v12" ) @@ -34,7 +36,7 @@ func main() { paramsAsArray := []string{"theParam1", "theParam2", "paramThirdAfterStatic"} ctx.ViewData("ParamsAsArray", paramsAsArray) if err := ctx.View("page.jet"); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } }) diff --git a/_examples/view/template_jet_3/main.go b/_examples/view/template_jet_3/main.go index 8d7cc864..370c5d14 100644 --- a/_examples/view/template_jet_3/main.go +++ b/_examples/view/template_jet_3/main.go @@ -25,7 +25,7 @@ func main() { app.Get("/", func(ctx iris.Context) { if err := ctx.View("index.jet"); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } }) diff --git a/_examples/view/template_pug_0/main.go b/_examples/view/template_pug_0/main.go index 548f2ac1..3b2cd34c 100644 --- a/_examples/view/template_pug_0/main.go +++ b/_examples/view/template_pug_0/main.go @@ -1,7 +1,11 @@ // Package main shows an example of pug actions based on https://github.com/Joker/jade/tree/master/example/actions package main -import "github.com/kataras/iris/v12" +import ( + "fmt" + + "github.com/kataras/iris/v12" +) type Person struct { Name string @@ -39,7 +43,7 @@ func index(ctx iris.Context) { } if err := ctx.View("index.pug", person); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } diff --git a/_examples/view/template_pug_1/main.go b/_examples/view/template_pug_1/main.go index fac8bb86..837ebe5a 100644 --- a/_examples/view/template_pug_1/main.go +++ b/_examples/view/template_pug_1/main.go @@ -1,6 +1,7 @@ package main import ( + "fmt" "html/template" "github.com/kataras/iris/v12" @@ -25,7 +26,7 @@ func main() { func index(ctx iris.Context) { if err := ctx.View("index.pug"); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } diff --git a/_examples/view/template_pug_2_embedded/main.go b/_examples/view/template_pug_2_embedded/main.go index c04d08ba..81555957 100644 --- a/_examples/view/template_pug_2_embedded/main.go +++ b/_examples/view/template_pug_2_embedded/main.go @@ -1,6 +1,10 @@ package main -import "github.com/kataras/iris/v12" +import ( + "fmt" + + "github.com/kataras/iris/v12" +) // $ go install github.com/go-bindata/go-bindata/v3/go-bindata@latest // @@ -23,7 +27,7 @@ func main() { func index(ctx iris.Context) { if err := ctx.View("index.pug"); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } diff --git a/_examples/websocket/gorilla-filewatch/main.go b/_examples/websocket/gorilla-filewatch/main.go index 4254ab50..0c40fed7 100644 --- a/_examples/websocket/gorilla-filewatch/main.go +++ b/_examples/websocket/gorilla-filewatch/main.go @@ -12,6 +12,7 @@ package main import ( "flag" + "fmt" "log" "os" "strconv" @@ -147,7 +148,7 @@ func serveHome(ctx iris.Context) { strconv.FormatInt(lastMod.UnixNano(), 16), } if err := ctx.View("home.html", v); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } diff --git a/_examples/websocket/native-messages/main.go b/_examples/websocket/native-messages/main.go index ffd83d57..b0cd1e6f 100644 --- a/_examples/websocket/native-messages/main.go +++ b/_examples/websocket/native-messages/main.go @@ -1,6 +1,7 @@ package main import ( + "fmt" "log" "github.com/kataras/iris/v12" @@ -50,7 +51,7 @@ func main() { app.Get("/", func(ctx iris.Context) { if err := ctx.View("client.html", clientPage{"Client Page", "localhost:8080"}); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } }) diff --git a/_examples/websocket/online-visitors/main.go b/_examples/websocket/online-visitors/main.go index 5b2b9651..7e42b39b 100644 --- a/_examples/websocket/online-visitors/main.go +++ b/_examples/websocket/online-visitors/main.go @@ -34,7 +34,7 @@ func main() { h := func(ctx iris.Context) { ctx.ViewData("", page{PageID: "index page"}) if err := ctx.View("index.html"); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } @@ -42,7 +42,7 @@ func main() { h2 := func(ctx iris.Context) { ctx.ViewData("", page{PageID: "other page"}) if err := ctx.View("other.html"); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } diff --git a/context/context.go b/context/context.go index 0a57a679..337aad9a 100644 --- a/context/context.go +++ b/context/context.go @@ -792,9 +792,9 @@ func (ctx *Context) StopWithStatus(statusCode int) { // // If the status code is a failure one then // it will also fire the specified error code handler. -func (ctx *Context) StopWithText(statusCode int, format string, args ...interface{}) { +func (ctx *Context) StopWithText(statusCode int, text string) { ctx.StopWithStatus(statusCode) - ctx.WriteString(fmt.Sprintf(format, args...)) + ctx.WriteString(text) } // StopWithError stops the handlers chain and writes the "statusCode" @@ -4034,15 +4034,15 @@ func (ctx *Context) Binary(data []byte) (int, error) { } // Text writes out a string as plain text. -func (ctx *Context) Text(format string, args ...interface{}) (int, error) { +func (ctx *Context) Text(text string) (int, error) { ctx.ContentType(ContentTextHeaderValue) - return ctx.Writef(format, args...) + return ctx.WriteString(text) } // HTML writes out a string as text/html. -func (ctx *Context) HTML(format string, args ...interface{}) (int, error) { +func (ctx *Context) HTML(text string) (int, error) { ctx.ContentType(ContentHTMLHeaderValue) - return ctx.Writef(format, args...) + return ctx.WriteString(text) } // ProtoMarshalOptions is a type alias for protojson.MarshalOptions. diff --git a/core/router/api_builder.go b/core/router/api_builder.go index f9ef4ada..096fd887 100644 --- a/core/router/api_builder.go +++ b/core/router/api_builder.go @@ -1804,7 +1804,7 @@ func (api *APIBuilder) FallbackView(provider context.FallbackViewProvider) { // // my.Get("/", func(ctx iris.Context) { // if err := ctx.View("page1.html"); err != nil { -// ctx.HTML("

%s

", err.Error()) +// ctx.HTML(fmt.Sprintf("

%s

", err.Error())) // return // } // }) diff --git a/core/router/party.go b/core/router/party.go index 079fee9e..1fbc538f 100644 --- a/core/router/party.go +++ b/core/router/party.go @@ -466,7 +466,7 @@ type Party interface { // my := app.Party("/my").Layout("layouts/mylayout.html") // my.Get("/", func(ctx iris.Context) { // if err := ctx.View("page1.html"); err != nil { - // ctx.HTML("

%s

", err.Error()) + // ctx.HTML(fmt.Sprintf("

%s

", err.Error())) // return // } // }) diff --git a/core/router/router_test.go b/core/router/router_test.go index fb50be11..7f8e75ee 100644 --- a/core/router/router_test.go +++ b/core/router/router_test.go @@ -1,6 +1,7 @@ package router_test import ( + "fmt" "io" "net/http" "strings" @@ -200,7 +201,7 @@ func TestNewSubdomainPartyRedirectHandler(t *testing.T) { func TestHandleServer(t *testing.T) { otherApp := iris.New() otherApp.Get("/test/me/{first:string}", func(ctx iris.Context) { - ctx.HTML("

Other App: %s

", ctx.Params().Get("first")) + ctx.HTML(fmt.Sprintf("

Other App: %s

", ctx.Params().Get("first"))) }) otherApp.Build() diff --git a/core/router/router_wildcard_root_test.go b/core/router/router_wildcard_root_test.go index 07642d05..709ca38b 100644 --- a/core/router/router_wildcard_root_test.go +++ b/core/router/router_wildcard_root_test.go @@ -48,7 +48,7 @@ var h2 = func(ctx *context.Context) { } func h3(ctx *context.Context) { - ctx.Writef(staticPathPrefixBody + ctx.Path()) + ctx.WriteString(staticPathPrefixBody + ctx.Path()) } func TestRouterWildcardDifferentPrefixPath(t *testing.T) { diff --git a/hero/dependency_test.go b/hero/dependency_test.go index 0a20c35f..a3edcba6 100644 --- a/hero/dependency_test.go +++ b/hero/dependency_test.go @@ -1,6 +1,7 @@ package hero_test import ( + "errors" "fmt" "reflect" "testing" @@ -111,9 +112,9 @@ func TestDependentDependency(t *testing.T) { }, { // 3 Dependency: func(msg testMessage) error { - return fmt.Errorf(msg.Body) + return errors.New(msg.Body) }, - Expected: fmt.Errorf(msgBody), + Expected: errors.New(msgBody), }, // Test depend on more than one previous registered dependencies and require a before-previous one. { // 4 diff --git a/macro/interpreter/parser/parser.go b/macro/interpreter/parser/parser.go index 99862663..d24eae71 100644 --- a/macro/interpreter/parser/parser.go +++ b/macro/interpreter/parser/parser.go @@ -1,6 +1,7 @@ package parser import ( + "errors" "fmt" "strconv" "strings" @@ -101,7 +102,7 @@ const ( func (p ParamParser) Error() error { if len(p.errors) > 0 { - return fmt.Errorf(strings.Join(p.errors, "\n")) + return errors.New(strings.Join(p.errors, "\n")) } return nil } diff --git a/middleware/basicauth/error.go b/middleware/basicauth/error.go index af991515..6306c6ef 100644 --- a/middleware/basicauth/error.go +++ b/middleware/basicauth/error.go @@ -96,7 +96,7 @@ func DefaultErrorHandler(ctx *context.Context, err error) { unauthorize(ctx, e.AuthenticateHeader, e.AuthenticateHeaderValue, e.Code) default: // This will never happen. - ctx.StopWithText(http.StatusInternalServerError, "unknown error: %v", err) + ctx.StopWithText(http.StatusInternalServerError, fmt.Sprintf("unknown error: %v", err)) } } diff --git a/mvc/controller_method_parser.go b/mvc/controller_method_parser.go index dd8df5a7..4040c89e 100644 --- a/mvc/controller_method_parser.go +++ b/mvc/controller_method_parser.go @@ -10,6 +10,9 @@ import ( "github.com/kataras/iris/v12/core/router" "github.com/kataras/iris/v12/macro" + + "golang.org/x/text/cases" + "golang.org/x/text/language" ) const ( @@ -137,8 +140,8 @@ func parseMethod(macros *macro.Macros, fn reflect.Method, skipper func(string) b } func methodTitle(httpMethod string) string { - httpMethodFuncName := strings.Title(strings.ToLower(httpMethod)) - return httpMethodFuncName + caser := cases.Title(language.English) + return caser.String(strings.ToLower(httpMethod)) } var errSkip = errors.New("skip") diff --git a/mvc/controller_test.go b/mvc/controller_test.go index 6d207011..a07c2e05 100644 --- a/mvc/controller_test.go +++ b/mvc/controller_test.go @@ -19,7 +19,7 @@ type testController struct { } var writeMethod = func(ctx *context.Context) { - ctx.Writef(ctx.Method()) + ctx.WriteString(ctx.Method()) } func (c *testController) Get() { @@ -108,15 +108,15 @@ func (c *testControllerBeginAndEndRequestFunc) BeginRequest(ctx *context.Context // called after every method (Get() or Post()). func (c *testControllerBeginAndEndRequestFunc) EndRequest(ctx *context.Context) { - ctx.Writef("done") // append "done" to the response + ctx.WriteString("done") // append "done" to the response } func (c *testControllerBeginAndEndRequestFunc) Get() { - c.Ctx.Writef(c.Username) + c.Ctx.WriteString(c.Username) } func (c *testControllerBeginAndEndRequestFunc) Post() { - c.Ctx.Writef(c.Username) + c.Ctx.WriteString(c.Username) } func TestControllerBeginAndEndRequestFunc(t *testing.T) { @@ -230,7 +230,7 @@ func writeModels(ctx *context.Context, names ...string) { return } - ctx.Writef(model.Username) + ctx.WriteString(model.Username) } } @@ -269,7 +269,7 @@ type testControllerBindStruct struct { } func (t *testControllerBindStruct) Get() { - t.Ctx.Writef(t.TitlePointer.title + t.TitleValue.title + t.Other) + t.Ctx.WriteString(t.TitlePointer.title + t.TitleValue.title + t.Other) } // test if context can be binded to the controller's function @@ -291,7 +291,7 @@ func (t *testControllerBindDeep) BeforeActivation(b BeforeActivation) { func (t *testControllerBindDeep) Get() { // t.testControllerBindStruct.Get() - t.Ctx.Writef(t.TitlePointer.title + t.TitleValue.title + t.Other) + t.Ctx.WriteString(t.TitlePointer.title + t.TitleValue.title + t.Other) } func (t *testControllerBindDeep) Post(v testCustomStruct) string { @@ -338,9 +338,9 @@ func (c *testCtrl0) Get() string { func (c *testCtrl0) EndRequest(ctx *context.Context) { if c.TitlePointer == nil { - ctx.Writef("\nTitlePointer is nil!\n") + ctx.WriteString("\nTitlePointer is nil!\n") } else { - ctx.Writef(c.TitlePointer.title) + ctx.WriteString(c.TitlePointer.title) } // should be the same as `.testCtrl000.testCtrl0000.EndRequest(ctx)` diff --git a/sessions/sessions_test.go b/sessions/sessions_test.go index 0ee2bd06..b1b47d77 100644 --- a/sessions/sessions_test.go +++ b/sessions/sessions_test.go @@ -93,7 +93,7 @@ func testSessions(t *testing.T, app *iris.Application) { ctx.Next() }, func(ctx *context.Context) { s := sessions.Get(ctx) - _, err := ctx.Writef(s.GetString("key")) + _, err := ctx.WriteString(s.GetString("key")) if err != nil { t.Fatal(err) } diff --git a/view/README.md b/view/README.md index d0a947f7..9ea46c3b 100644 --- a/view/README.md +++ b/view/README.md @@ -44,7 +44,7 @@ func main() { ctx.ViewData("message", "Hello world!") // Render template file: ./views/hello.html if err := ctx.View("hello.html"); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } }) @@ -109,7 +109,7 @@ func main() { func hi(ctx iris.Context) { // render the template file "./templates/hi.html" if err := ctx.View("hi.html"); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } @@ -156,7 +156,7 @@ func hi(ctx iris.Context) { // {{.Page.Title}} and {{Page.Name}} ctx.ViewData("Page", page{Title: "Hi Page", Name: "iris"}) if err := ctx.View("hi.html"); err != nil { - ctx.HTML("

%s

", err.Error()) + ctx.HTML(fmt.Sprintf("

%s

", err.Error())) return } } diff --git a/x/errors/errors.go b/x/errors/errors.go index 2782ebb1..014f5c02 100644 --- a/x/errors/errors.go +++ b/x/errors/errors.go @@ -271,13 +271,13 @@ func (e ErrorCodeName) MapErrors(targets ...error) { } // Message sends an error with a simple message to the client. -func (e ErrorCodeName) Message(ctx *context.Context, format string, args ...interface{}) { - fail(ctx, e, sprintf(format, args...), "", nil, nil) +func (e ErrorCodeName) Message(ctx *context.Context, msg string) { + fail(ctx, e, msg, "", nil, nil) } // Details sends an error with a message and details to the client. -func (e ErrorCodeName) Details(ctx *context.Context, msg, details string, detailsArgs ...interface{}) { - fail(ctx, e, msg, sprintf(details, detailsArgs...), nil, nil) +func (e ErrorCodeName) Details(ctx *context.Context, msg, details string) { + fail(ctx, e, msg, msg, nil, nil) } // Data sends an error with a message and json data to the client. @@ -419,7 +419,7 @@ func handleJSONError(ctx *context.Context, err error) bool { var syntaxErr *json.SyntaxError if errors.As(err, &syntaxErr) { - wireError.Details(ctx, messageText, "json: syntax error at byte offset %d", syntaxErr.Offset) + wireError.Details(ctx, messageText, fmt.Sprintf("json: syntax error at byte offset %d", syntaxErr.Offset)) return true } diff --git a/x/errors/handlers.go b/x/errors/handlers.go index 61b2113b..9a4c9e33 100644 --- a/x/errors/handlers.go +++ b/x/errors/handlers.go @@ -220,7 +220,7 @@ func Validation[T any](validators ...ContextRequestFunc[T]) context.Handler { return nil } - validator := joinContextRequestFuncs[T](validators) + validator := joinContextRequestFuncs(validators) return func(ctx *context.Context) { ctx.Values().Set(contextRequestHandlerFuncKey, validator) @@ -322,7 +322,7 @@ func Intercept[T, R any](responseHandlers ...ContextResponseFunc[T, R]) context. return nil } - responseHandler := joinContextResponseFuncs[T, R](responseHandlers) + responseHandler := joinContextResponseFuncs(responseHandlers) return func(ctx *context.Context) { ctx.Values().Set(contextResponseHandlerFuncKey, responseHandler)