From 8988f8caa7e1bd2ca2557b0835bfc4b80909922f Mon Sep 17 00:00:00 2001 From: caixw Date: Thu, 29 Feb 2024 00:06:44 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=20assert=20?= =?UTF-8?q?=E8=87=B3=20v4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/test.yml | 4 ++-- gb11643/gb11643.go | 4 ++-- gb11643/gb11643_test.go | 4 +++- gb11643/valid.go | 2 ++ gb11643/valid_test.go | 6 ++++-- gb32100/gb32100.go | 2 ++ gb32100/gb32100_test.go | 4 +++- gb32100/valid.go | 2 ++ gb32100/valid_test.go | 4 +++- go.mod | 4 ++-- go.sum | 8 ++++---- internal/isbn/isbn.go | 2 ++ internal/isbn/isbn_test.go | 4 +++- internal/strength/strength.go | 2 ++ internal/strength/strength_test.go | 4 +++- luhn/luhn.go | 2 ++ luhn/luhn_test.go | 4 +++- sanitizer/sanitizer.go | 2 ++ sanitizer/sanitizer_test.go | 4 +++- validator/bench_test.go | 2 ++ validator/number.go | 2 ++ validator/number_test.go | 4 +++- validator/regexp.go | 2 ++ validator/regexp_test.go | 4 +++- validator/slice.go | 2 ++ validator/slice_test.go | 4 +++- validator/string.go | 2 ++ validator/string_test.go | 4 +++- validator/validator.go | 2 ++ validator/validator_test.go | 4 +++- 31 files changed, 77 insertions(+), 25 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 5c7f39a..4ea884e 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -30,7 +30,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: # We must fetch at least the immediate parents so that if this is # a pull request then we can checkout the head. diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 363ac15..8e0f912 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,7 +10,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macOS-latest, windows-latest] - go: ['1.18.x', '1.21.x'] + go: ['1.18.x', '1.22.x'] steps: @@ -20,7 +20,7 @@ jobs: git config --global core.eol lf - name: Check out code into the Go module directory - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Go ${{ matrix.go }} uses: actions/setup-go@v4 diff --git a/gb11643/gb11643.go b/gb11643/gb11643.go index aa7c150..d5b0a5c 100644 --- a/gb11643/gb11643.go +++ b/gb11643/gb11643.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2022-2024 caixw +// // SPDX-License-Identifier: MIT // Package gb11643 解析身分证详情 @@ -34,8 +36,6 @@ type GB11643 struct { } // Parse 分析身份证信息 -// -// 不作正确性检测，如有需求，请使用 is.GB11643 func Parse(bs string) (*GB11643, error) { if !IsValid([]byte(bs)) { return nil, ErrInvalidFormat diff --git a/gb11643/gb11643_test.go b/gb11643/gb11643_test.go index 3f29654..b992d12 100644 --- a/gb11643/gb11643_test.go +++ b/gb11643/gb11643_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2022-2024 caixw +// // SPDX-License-Identifier: MIT package gb11643 @@ -6,7 +8,7 @@ import ( "testing" "time" - "github.com/issue9/assert/v3" + "github.com/issue9/assert/v4" ) func TestParse(t *testing.T) { diff --git a/gb11643/valid.go b/gb11643/valid.go index 36bc67b..fe33b03 100644 --- a/gb11643/valid.go +++ b/gb11643/valid.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2022-2024 caixw +// // SPDX-License-Identifier: MIT package gb11643 diff --git a/gb11643/valid_test.go b/gb11643/valid_test.go index 8847802..4e4bfcc 100644 --- a/gb11643/valid_test.go +++ b/gb11643/valid_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2022-2024 caixw +// // SPDX-License-Identifier: MIT package gb11643 @@ -6,13 +8,13 @@ import ( "math" "testing" - "github.com/issue9/assert/v3" + "github.com/issue9/assert/v4" ) // 计算各个数值位对应的系数值。 func getWeight() []int { l := 17 - ret := make([]int, 17, 17) + ret := make([]int, 17) for i := 0; i < l; i++ { k := int(math.Pow(2, float64((l - i)))) // k值足够大，不能用byte保存 ret[i] = k % 11 diff --git a/gb32100/gb32100.go b/gb32100/gb32100.go index c67da68..ff7a6fc 100644 --- a/gb32100/gb32100.go +++ b/gb32100/gb32100.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2022-2024 caixw +// // SPDX-License-Identifier: MIT // Package gb32100 统一信用代码校验 diff --git a/gb32100/gb32100_test.go b/gb32100/gb32100_test.go index bc5bf7a..b257142 100644 --- a/gb32100/gb32100_test.go +++ b/gb32100/gb32100_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2022-2024 caixw +// // SPDX-License-Identifier: MIT package gb32100 @@ -5,7 +7,7 @@ package gb32100 import ( "testing" - "github.com/issue9/assert/v3" + "github.com/issue9/assert/v4" ) var validData = []string{ diff --git a/gb32100/valid.go b/gb32100/valid.go index ce9dbf9..8e09f1c 100644 --- a/gb32100/valid.go +++ b/gb32100/valid.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2022-2024 caixw +// // SPDX-License-Identifier: MIT package gb32100 diff --git a/gb32100/valid_test.go b/gb32100/valid_test.go index de9ceeb..03a2b49 100644 --- a/gb32100/valid_test.go +++ b/gb32100/valid_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2022-2024 caixw +// // SPDX-License-Identifier: MIT package gb32100 @@ -5,7 +7,7 @@ package gb32100 import ( "testing" - "github.com/issue9/assert/v3" + "github.com/issue9/assert/v4" ) func TestCodes(t *testing.T) { diff --git a/go.mod b/go.mod index de74ccf..ff3f34f 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,6 @@ module github.com/issue9/filter go 1.18 require ( - github.com/issue9/assert/v3 v3.1.0 - github.com/issue9/sliceutil v0.15.0 + github.com/issue9/assert/v4 v4.1.1 + github.com/issue9/sliceutil v0.15.1 ) diff --git a/go.sum b/go.sum index 77092e1..fd7d3e2 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,4 @@ -github.com/issue9/assert/v3 v3.1.0 h1:oxLFXS7QnBKI4lB31pRoYO96yErkWAJtR7iv+LNjAPg= -github.com/issue9/assert/v3 v3.1.0/go.mod h1:yft/uaskRpwQTyBT3n1zRl91SR1wNlO4fLZHzOa4bdM= -github.com/issue9/sliceutil v0.15.0 h1:E6Xnl3FY5h0ZGNzyx1VEFAfGdParaq/BkX1QQR0uFwI= -github.com/issue9/sliceutil v0.15.0/go.mod h1:n9meV7AamDhmehOBuV4GrxW3yw7O1cZmLx3Xizg1bps= +github.com/issue9/assert/v4 v4.1.1 h1:OhPE8SB8n/qZCNGLQa+6MQtr/B3oON0JAVj68k8jJlc= +github.com/issue9/assert/v4 v4.1.1/go.mod h1:v7qDRXi7AsaZZNh8eAK2rkLJg5/clztqQGA1DRv9Lv4= +github.com/issue9/sliceutil v0.15.1 h1:mV1VlQSO5E8sh2ab6pypLg7TdgGZlDb30E8quli01xY= +github.com/issue9/sliceutil v0.15.1/go.mod h1:ldun6sT4/bOJxuMtOXhtc6P7GCwE7L+avV86HNks7qk= diff --git a/internal/isbn/isbn.go b/internal/isbn/isbn.go index 9010e4d..60af8d5 100644 --- a/internal/isbn/isbn.go +++ b/internal/isbn/isbn.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2022-2024 caixw +// // SPDX-License-Identifier: MIT package isbn diff --git a/internal/isbn/isbn_test.go b/internal/isbn/isbn_test.go index 2e6d647..5d3fa35 100644 --- a/internal/isbn/isbn_test.go +++ b/internal/isbn/isbn_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2022-2024 caixw +// // SPDX-License-Identifier: MIT package isbn @@ -5,7 +7,7 @@ package isbn import ( "testing" - "github.com/issue9/assert/v3" + "github.com/issue9/assert/v4" ) func TestEraseMinus(t *testing.T) { diff --git a/internal/strength/strength.go b/internal/strength/strength.go index ff3c9a6..8f50cb7 100644 --- a/internal/strength/strength.go +++ b/internal/strength/strength.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2022-2024 caixw +// // SPDX-License-Identifier: MIT package strength diff --git a/internal/strength/strength_test.go b/internal/strength/strength_test.go index 5f12d13..7a48c31 100644 --- a/internal/strength/strength_test.go +++ b/internal/strength/strength_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2022-2024 caixw +// // SPDX-License-Identifier: MIT package strength @@ -5,7 +7,7 @@ package strength import ( "testing" - "github.com/issue9/assert/v3" + "github.com/issue9/assert/v4" ) func TestStrength(t *testing.T) { diff --git a/luhn/luhn.go b/luhn/luhn.go index 593e565..7c145f4 100644 --- a/luhn/luhn.go +++ b/luhn/luhn.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2022-2024 caixw +// // SPDX-License-Identifier: MIT // Package [luhn] 模 10 校验算法 diff --git a/luhn/luhn_test.go b/luhn/luhn_test.go index 3054d40..8dcc84e 100644 --- a/luhn/luhn_test.go +++ b/luhn/luhn_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2022-2024 caixw +// // SPDX-License-Identifier: MIT package luhn @@ -5,7 +7,7 @@ package luhn import ( "testing" - "github.com/issue9/assert/v3" + "github.com/issue9/assert/v4" ) func TestIsValid(t *testing.T) { diff --git a/sanitizer/sanitizer.go b/sanitizer/sanitizer.go index 1cf1f59..caae703 100644 --- a/sanitizer/sanitizer.go +++ b/sanitizer/sanitizer.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2022-2024 caixw +// // SPDX-License-Identifier: MIT // Package sanitizer 内容修正工具 diff --git a/sanitizer/sanitizer_test.go b/sanitizer/sanitizer_test.go index e13ec29..298e02c 100644 --- a/sanitizer/sanitizer_test.go +++ b/sanitizer/sanitizer_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2022-2024 caixw +// // SPDX-License-Identifier: MIT package sanitizer @@ -5,7 +7,7 @@ package sanitizer import ( "testing" - "github.com/issue9/assert/v3" + "github.com/issue9/assert/v4" ) func TestSanitizers(t *testing.T) { diff --git a/validator/bench_test.go b/validator/bench_test.go index 7e5bf88..49e278c 100644 --- a/validator/bench_test.go +++ b/validator/bench_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2022-2024 caixw +// // SPDX-License-Identifier: MIT package validator diff --git a/validator/number.go b/validator/number.go index 76a287e..2be5238 100644 --- a/validator/number.go +++ b/validator/number.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2022-2024 caixw +// // SPDX-License-Identifier: MIT package validator diff --git a/validator/number_test.go b/validator/number_test.go index ea3b6bc..613564d 100644 --- a/validator/number_test.go +++ b/validator/number_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2022-2024 caixw +// // SPDX-License-Identifier: MIT package validator @@ -6,7 +8,7 @@ import ( "math" "testing" - "github.com/issue9/assert/v3" + "github.com/issue9/assert/v4" ) func TestRange(t *testing.T) { diff --git a/validator/regexp.go b/validator/regexp.go index d6bdc02..ba6c54a 100644 --- a/validator/regexp.go +++ b/validator/regexp.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2022-2024 caixw +// // SPDX-License-Identifier: MIT package validator diff --git a/validator/regexp_test.go b/validator/regexp_test.go index e9147cb..b47b903 100644 --- a/validator/regexp_test.go +++ b/validator/regexp_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2022-2024 caixw +// // SPDX-License-Identifier: MIT package validator @@ -5,7 +7,7 @@ package validator import ( "testing" - "github.com/issue9/assert/v3" + "github.com/issue9/assert/v4" ) func TestCNPhone(t *testing.T) { diff --git a/validator/slice.go b/validator/slice.go index b41eabd..74d4b1b 100644 --- a/validator/slice.go +++ b/validator/slice.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2022-2024 caixw +// // SPDX-License-Identifier: MIT package validator diff --git a/validator/slice_test.go b/validator/slice_test.go index 6bbbc24..d48bbad 100644 --- a/validator/slice_test.go +++ b/validator/slice_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2022-2024 caixw +// // SPDX-License-Identifier: MIT package validator @@ -5,7 +7,7 @@ package validator import ( "testing" - "github.com/issue9/assert/v3" + "github.com/issue9/assert/v4" ) type object struct { diff --git a/validator/string.go b/validator/string.go index 923a957..45b43bd 100644 --- a/validator/string.go +++ b/validator/string.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2022-2024 caixw +// // SPDX-License-Identifier: MIT package validator diff --git a/validator/string_test.go b/validator/string_test.go index cd53d2d..b8eabec 100644 --- a/validator/string_test.go +++ b/validator/string_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2022-2024 caixw +// // SPDX-License-Identifier: MIT package validator @@ -5,7 +7,7 @@ package validator import ( "testing" - "github.com/issue9/assert/v3" + "github.com/issue9/assert/v4" ) func TestHexColor(t *testing.T) { diff --git a/validator/validator.go b/validator/validator.go index 272488a..7f53ce5 100644 --- a/validator/validator.go +++ b/validator/validator.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2022-2024 caixw +// // SPDX-License-Identifier: MIT // Package validator 符合 [web.filter] 的验证器 diff --git a/validator/validator_test.go b/validator/validator_test.go index edc6de0..fe843fd 100644 --- a/validator/validator_test.go +++ b/validator/validator_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2022-2024 caixw +// // SPDX-License-Identifier: MIT package validator @@ -5,7 +7,7 @@ package validator import ( "testing" - "github.com/issue9/assert/v3" + "github.com/issue9/assert/v4" ) func TestNot(t *testing.T) {