fix

Author: wxiaoguang

modules/structs/form.go

@@ -0,0 +1,28 @@
+// Copyright 2026 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package structs
+
+import (
+	"net/http"
+
+	"gitea.dev/modules/reqctx"
+	"gitea.dev/modules/translation/i18n"
+
+	"gitea.com/go-chi/binding"
+)
+
+// ValidateContext is a special context for form validation middleware
+type ValidateContext struct {
+	Locale i18n.LocaleTranslation
+	Data   reqctx.ContextData
+	Req    *http.Request
+	Resp   http.ResponseWriter
+}
+
+type FormDefaultValidator struct{}
+
+func (FormDefaultValidator) Validate(ctx *ValidateContext, errs binding.Errors) binding.Errors {
+	// this default validator only needs to return the errs as is because the "binding" function has already validated
+	return errs
+}

modules/structs/miscellaneous.go

@@ -21,6 +21,7 @@ type SearchError struct {
 
 // MarkupOption markup options
 type MarkupOption struct {
+	FormDefaultValidator
 	// Text markup to render
 	//
 	// in: body

modules/translation/i18n/i18n.go

@@ -19,6 +19,18 @@ type Locale interface {
 	HasKey(trKey string) bool
 }
 
+// LocaleTranslation represents an interface to translation
+type LocaleTranslation interface {
+	Language() string
+	HasKey(trKey string) bool
+	TrString(string, ...any) string
+
+	Tr(key string, args ...any) template.HTML
+	TrN(cnt any, key1, keyN string, args ...any) template.HTML
+
+	PrettyNumber(v any) string
+}
+
 // LocaleStore provides the functions common to all locale stores
 type LocaleStore interface {
 	io.Closer
@@ -31,7 +43,7 @@ type LocaleStore interface {
 	Locale(langName string) (Locale, bool)
 	// HasLang returns whether a given language is present in the store
 	HasLang(langName string) bool
-	// AddLocaleByIni adds a new language to the store
+	// AddLocaleByJSON adds a new language to the store
 	AddLocaleByJSON(langName, langDesc string, source, moreSource []byte) error
 }
 

modules/translation/mock.go

@@ -14,6 +14,10 @@ type MockLocale struct {
 	Lang, LangName string // these fields are used directly in templates: ctx.Locale.Lang
 }
 
+func (l MockLocale) HasKey(trKey string) bool {
+	return true
+}
+
 var _ Locale = (*MockLocale)(nil)
 
 func (l MockLocale) Language() string {

modules/translation/translation.go

@@ -25,16 +25,7 @@ type contextKey struct{}
 
 var ContextKey any = &contextKey{}
 
-// Locale represents an interface to translation
-type Locale interface {
-	Language() string
-	TrString(string, ...any) string
-
-	Tr(key string, args ...any) template.HTML
-	TrN(cnt any, key1, keyN string, args ...any) template.HTML
-
-	PrettyNumber(v any) string
-}
+type Locale = i18n.LocaleTranslation
 
 // LangType represents a lang type
 type LangType struct {

modules/validation/binding_test.go

@@ -37,13 +37,7 @@ func performValidationTest(t *testing.T, testCase validationTestCase) {
 	m := chi.NewRouter()
 
 	m.Post(testRoute, func(resp http.ResponseWriter, req *http.Request) {
-		actual := binding.Validate(req, testCase.data)
-		// see https://github.com/stretchr/testify/issues/435
-		if actual == nil {
-			actual = binding.Errors{}
-		}
-
-		assert.Equal(t, testCase.expectedErrors, actual)
+		assert.Equal(t, testCase.expectedErrors, binding.Validate(req, testCase.data))
 	})
 
 	req, err := http.NewRequest(http.MethodPost, testRoute, nil)

modules/validation/glob_pattern_test.go

@@ -29,14 +29,12 @@ func Test_GlobPatternValidation(t *testing.T) {
 			data: TestForm{
 				GlobPattern: "",
 			},
-			expectedErrors: binding.Errors{},
 		},
 		{
 			description: "Valid glob",
 			data: TestForm{
 				GlobPattern: "{master,release*}",
 			},
-			expectedErrors: binding.Errors{},
 		},
 
 		{

modules/validation/refname_test.go

@@ -17,21 +17,18 @@ func Test_GitRefNameValidation(t *testing.T) {
 			data: TestForm{
 				BranchName: "test",
 			},
-			expectedErrors: binding.Errors{},
 		},
 		{
 			description: "Reference name contains single slash",
 			data: TestForm{
 				BranchName: "feature/test",
 			},
-			expectedErrors: binding.Errors{},
 		},
 		{
 			description: "Reference name has allowed special characters",
 			data: TestForm{
 				BranchName: "debian/1%1.6.0-2",
 			},
-			expectedErrors: binding.Errors{},
 		},
 		{
 			description: "Reference name contains backslash",

modules/validation/regex_pattern_test.go

@@ -26,14 +26,12 @@ func Test_RegexPatternValidation(t *testing.T) {
 			data: TestForm{
 				RegexPattern: "",
 			},
-			expectedErrors: binding.Errors{},
 		},
 		{
 			description: "Valid regex",
 			data: TestForm{
 				RegexPattern: `(\d{1,3})+`,
 			},
-			expectedErrors: binding.Errors{},
 		},
 
 		{

modules/validation/validurl_test.go

@@ -18,35 +18,30 @@ func Test_ValidURLValidation(t *testing.T) {
 			data: TestForm{
 				URL: "",
 			},
-			expectedErrors: binding.Errors{},
 		},
 		{
 			description: "URL without port",
 			data: TestForm{
 				URL: "http://test.lan/",
 			},
-			expectedErrors: binding.Errors{},
 		},
 		{
 			description: "URL with port",
 			data: TestForm{
 				URL: "http://test.lan:3000/",
 			},
-			expectedErrors: binding.Errors{},
 		},
 		{
 			description: "URL with IPv6 address without port",
 			data: TestForm{
 				URL: "http://[::1]/",
 			},
-			expectedErrors: binding.Errors{},
 		},
 		{
 			description: "URL with IPv6 address with port",
 			data: TestForm{
 				URL: "http://[::1]:3000/",
 			},
-			expectedErrors: binding.Errors{},
 		},
 		{
 			description: "Invalid URL",