Merge 84a97ef73e13c71e757aaefddbaf9213e6bc3442 into f416d1e594a027063e73f66ac873a82113036fd8

binding/form_mapping.go

@@ -300,11 +300,6 @@ func setByForm(value reflect.Value, field reflect.StructField, form map[string][
 }
 
 func setWithProperType(val string, value reflect.Value, field reflect.StructField) error {
-	// If it is a string type, no spaces are removed, and the user data is not modified here
-	if value.Kind() != reflect.String {
-		val = strings.TrimSpace(val)
-	}
-
 	switch value.Kind() {
 	case reflect.Int:
 		return setIntField(val, 0, value)
@@ -409,11 +404,6 @@ func setTimeField(val string, structField reflect.StructField, value reflect.Val
 		timeFormat = time.RFC3339
 	}
 
-	if val == "" {
-		value.Set(reflect.ValueOf(time.Time{}))
-		return nil
-	}
-
 	switch tf := strings.ToLower(timeFormat); tf {
 	case "unix", "unixmilli", "unixmicro", "unixnano":
 		tv, err := strconv.ParseInt(val, 10, 64)
@@ -437,6 +427,11 @@ func setTimeField(val string, structField reflect.StructField, value reflect.Val
 		return nil
 	}
 
+	if val == "" {
+		value.Set(reflect.ValueOf(time.Time{}))
+		return nil
+	}
+
 	l := time.Local
 	if isUTC, _ := strconv.ParseBool(structField.Tag.Get("time_utc")); isUTC {
 		l = time.UTC
@@ -480,10 +475,6 @@ func setSlice(vals []string, value reflect.Value, field reflect.StructField) err
 }
 
 func setTimeDuration(val string, value reflect.Value) error {
-	if val == "" {
-		val = "0"
-	}
-
 	d, err := time.ParseDuration(val)
 	if err != nil {
 		return err

binding/form_mapping_test.go

@@ -226,35 +226,7 @@ func TestMappingTime(t *testing.T) {
 	require.Error(t, err)
 }
 
-type bindTestData struct {
-	need any
-	got  any
-	in   map[string][]string
-}
-
-func TestMappingTimeUnixNano(t *testing.T) {
-	type needFixUnixNanoEmpty struct {
-		CreateTime time.Time `form:"createTime" time_format:"unixNano"`
-	}
-
-	// ok
-	tests := []bindTestData{
-		{need: &needFixUnixNanoEmpty{}, got: &needFixUnixNanoEmpty{}, in: formSource{"createTime": []string{"   "}}},
-		{need: &needFixUnixNanoEmpty{}, got: &needFixUnixNanoEmpty{}, in: formSource{"createTime": []string{}}},
-	}
-
-	for _, v := range tests {
-		err := mapForm(v.got, v.in)
-		require.NoError(t, err)
-		assert.Equal(t, v.need, v.got)
-	}
-}
-
 func TestMappingTimeDuration(t *testing.T) {
-	type needFixDurationEmpty struct {
-		Duration time.Duration `form:"duration"`
-	}
-
 	var s struct {
 		D time.Duration
 	}
@@ -264,17 +236,6 @@ func TestMappingTimeDuration(t *testing.T) {
 	require.NoError(t, err)
 	assert.Equal(t, 5*time.Second, s.D)
 
-	// ok
-	tests := []bindTestData{
-		{need: &needFixDurationEmpty{}, got: &needFixDurationEmpty{}, in: formSource{"duration": []string{"   "}}},
-		{need: &needFixDurationEmpty{}, got: &needFixDurationEmpty{}, in: formSource{"duration": []string{}}},
-	}
-
-	for _, v := range tests {
-		err := mapForm(v.got, v.in)
-		require.NoError(t, err)
-		assert.Equal(t, v.need, v.got)
-	}
 	// error
 	err = mappingByPtr(&s, formSource{"D": {"wrong"}}, "form")
 	require.Error(t, err)

debug.go

@@ -13,9 +13,7 @@ import (
 	"sync/atomic"
 )
 
-const ginSupportMinGoVer = 24
-
-var runtimeVersion = runtime.Version()
+const ginSupportMinGoVer = 23
 
 // IsDebugging returns true if the framework is running in debug mode.
 // Use SetMode(gin.ReleaseMode) to disable debug mode.
@@ -79,7 +77,7 @@ func getMinVer(v string) (uint64, error) {
 }
 
 func debugPrintWARNINGDefault() {
-	if v, e := getMinVer(runtimeVersion); e == nil && v < ginSupportMinGoVer {
+	if v, e := getMinVer(runtime.Version()); e == nil && v < ginSupportMinGoVer {
 		debugPrint(`[WARNING] Now Gin requires Go 1.24+.
 
 `)

debug_test.go

@@ -12,6 +12,7 @@ import (
 	"log"
 	"net/http"
 	"os"
+	"runtime"
 	"strings"
 	"sync"
 	"testing"
@@ -20,6 +21,10 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+// TODO
+// func debugRoute(httpMethod, absolutePath string, handlers HandlersChain) {
+// func debugPrint(format string, values ...any) {
+
 func TestIsDebugging(t *testing.T) {
 	SetMode(DebugMode)
 	assert.True(t, IsDebugging())
@@ -43,18 +48,6 @@ func TestDebugPrint(t *testing.T) {
 	assert.Equal(t, "[GIN-debug] these are 2 error messages\n", re)
 }
 
-func TestDebugPrintFunc(t *testing.T) {
-	DebugPrintFunc = func(format string, values ...any) {
-		fmt.Fprintf(DefaultWriter, "[GIN-debug] "+format, values...)
-	}
-	re := captureOutput(t, func() {
-		SetMode(DebugMode)
-		debugPrint("debug print func test: %d", 123)
-		SetMode(TestMode)
-	})
-	assert.Regexp(t, `^\[GIN-debug\] debug print func test: 123`, re)
-}
-
 func TestDebugPrintError(t *testing.T) {
 	re := captureOutput(t, func() {
 		SetMode(DebugMode)
@@ -111,17 +104,12 @@ func TestDebugPrintWARNINGDefault(t *testing.T) {
 		debugPrintWARNINGDefault()
 		SetMode(TestMode)
 	})
-	assert.Equal(t, "[GIN-debug] [WARNING] Creating an Engine instance with the Logger and Recovery middleware already attached.\n\n", re)
-}
-
-func TestDebugPrintWARNINGDefaultWithUnsupportedVersion(t *testing.T) {
-	runtimeVersion = "go1.23.12"
-	re := captureOutput(t, func() {
-		SetMode(DebugMode)
-		debugPrintWARNINGDefault()
-		SetMode(TestMode)
-	})
-	assert.Equal(t, "[GIN-debug] [WARNING] Now Gin requires Go 1.24+.\n\n[GIN-debug] [WARNING] Creating an Engine instance with the Logger and Recovery middleware already attached.\n\n", re)
+	m, e := getMinVer(runtime.Version())
+	if e == nil && m < ginSupportMinGoVer {
+		assert.Equal(t, "[GIN-debug] [WARNING] Now Gin requires Go 1.24+.\n\n[GIN-debug] [WARNING] Creating an Engine instance with the Logger and Recovery middleware already attached.\n\n", re)
+	} else {
+		assert.Equal(t, "[GIN-debug] [WARNING] Creating an Engine instance with the Logger and Recovery middleware already attached.\n\n", re)
+	}
 }
 
 func TestDebugPrintWARNINGNew(t *testing.T) {

go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/gin-contrib/sse v1.1.0
 	github.com/go-playground/validator/v10 v10.28.0
 	github.com/goccy/go-json v0.10.2
-	github.com/goccy/go-yaml v1.19.0
+	github.com/goccy/go-yaml v1.18.0
 	github.com/json-iterator/go v1.1.12
 	github.com/mattn/go-isatty v0.0.20
 	github.com/modern-go/reflect2 v1.0.2

go.sum

@@ -24,8 +24,8 @@ github.com/go-playground/validator/v10 v10.28.0 h1:Q7ibns33JjyW48gHkuFT91qX48KG0
 github.com/go-playground/validator/v10 v10.28.0/go.mod h1:GoI6I1SjPBh9p7ykNE/yj3fFYbyDOpwMn5KXd+m2hUU=
 github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
 github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
-github.com/goccy/go-yaml v1.19.0 h1:EmkZ9RIsX+Uq4DYFowegAuJo8+xdX3T/2dwNPXbxEYE=
-github.com/goccy/go-yaml v1.19.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
+github.com/goccy/go-yaml v1.18.0 h1:8W7wMFS12Pcas7KU+VVkaiCng+kG8QiFeFwzFb+rwuw=
+github.com/goccy/go-yaml v1.18.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=