blackteay/gf
1
0
Fork 0
mirror of https://github.com/gogf/gf.git synced 2025-04-05 11:18:50 +08:00
Code Issues Projects Releases Wiki Activity

fix: gutil.IsMap judgment logic error (#2953)

Browse Source
This commit is contained in:
the harder the luckier 2023-09-13 19:30:02 +08:00 committed by GitHub
parent e684eae878
commit ef1e18df19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
container/gvar/gvar_z_unit_is_test.go
View File

@ -9,6 +9,7 @@ package gvar_test
import ( import (
"testing" "testing"
"github.com/gogf/gf/v2/container/gvar"
"github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/test/gtest" "github.com/gogf/gf/v2/test/gtest"
) )
@ -144,6 +145,10 @@ func TestVar_IsMap(t *testing.T) {
t.Assert(g.NewVar(int8(1)).IsMap(), false) t.Assert(g.NewVar(int8(1)).IsMap(), false)
t.Assert(g.NewVar(uint8(1)).IsMap(), false) t.Assert(g.NewVar(uint8(1)).IsMap(), false)
}) })
gtest.C(t, func(t *gtest.T) {
t.Assert(gvar.New(gvar.New("asd")).IsMap(), false)
t.Assert(gvar.New(&g.Map{"k": "v"}).IsMap(), true)
})
} }
func TestVar_IsStruct(t *testing.T) { func TestVar_IsStruct(t *testing.T) {

1
internal/utils/utils_is.go
View File

@ -74,6 +74,7 @@ func IsMap(value interface{}) bool {
) )
for reflectKind == reflect.Ptr { for reflectKind == reflect.Ptr {
reflectValue = reflectValue.Elem() reflectValue = reflectValue.Elem()
reflectKind = reflectValue.Kind()
} }
switch reflectKind { switch reflectKind {
case reflect.Map: case reflect.Map: