Restore

goravel · Oct 12, 2023 · 25ea367 · 25ea367
1 parent acb2b20
commit 25ea367
Show file tree

Hide file tree

Showing 186 changed files with 669 additions and 3,075 deletions.
diff --git a/.github/workflows/cr.yml b/.github/workflows/cr.yml
@@ -0,0 +1,22 @@
+name: Code Review
+
+permissions:
+  contents: read
+  pull-requests: write
+
+on:
+  pull_request:
+    types: [ opened, reopened, synchronize, labeled ]
+
+jobs:
+  test:
+    if: ${{ contains(github.event.pull_request.labels.*.name, '🚀 Review Ready') }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: anc95/ChatGPT-CodeReview@main
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
+          OPENAI_API_ENDPOINT: https://api.openai-sb.com/v1
+          MODEL: gpt-3.5-turbo
+          PROMPT: "Below is a code patch, please help me do a brief code review on it. Only answer important bug risks and/or important improvement suggestions, Answer must be concisely and short: "
diff --git a/.github/workflows/mockery.yml b/.github/workflows/mockery.yml
diff --git a/README.md b/README.md
@@ -69,6 +69,13 @@ This project exists thanks to all the people who contribute, to participate in t
 <a href="https://github.com/Marian0" target="_blank"><img src="https://avatars.githubusercontent.com/u/624592?v=4" width="48" height="48"></a>
 <a href="https://github.com/ahmed3mar" target="_blank"><img src="https://avatars.githubusercontent.com/u/12982325?v=4" width="48" height="48"></a>
 <a href="https://github.com/flc1125" target="_blank"><img src="https://avatars.githubusercontent.com/u/14297703?v=4" width="48" height="48"></a>
+<a href="https://github.com/zzpwestlife" target="_blank"><img src="https://avatars.githubusercontent.com/u/12382180?v=4" width="48" height="48"></a>
+
+## Sponsor
+
+Better development of the project is inseparable from your support, reward us by [Open Collective](https://opencollective.com/goravel).
+
+<p align="left"><img src="https://www.goravel.dev/reward.png" width="200"></p>
 
 ## Group
 

diff --git a/README_zh.md b/README_zh.md
@@ -67,6 +67,13 @@ Laravel！
 <a href="https://github.com/Marian0" target="_blank"><img src="https://avatars.githubusercontent.com/u/624592?v=4" width="48" height="48"></a>
 <a href="https://github.com/ahmed3mar" target="_blank"><img src="https://avatars.githubusercontent.com/u/12982325?v=4" width="48" height="48"></a>
 <a href="https://github.com/flc1125" target="_blank"><img src="https://avatars.githubusercontent.com/u/14297703?v=4" width="48" height="48"></a>
+<a href="https://github.com/zzpwestlife" target="_blank"><img src="https://avatars.githubusercontent.com/u/12382180?v=4" width="48" height="48"></a>
+
+## 打赏
+
+开源项目的发展离不开您的支持，感谢微信打赏。
+
+<p align="left"><img src="https://www.goravel.dev/reward-wechat.jpg" width="200"></p>
 
 ## 群组
 

diff --git a/auth/auth_test.go b/auth/auth_test.go
@@ -13,11 +13,11 @@ import (
 	"gorm.io/gorm/clause"
 
 	authcontract "github.com/goravel/framework/contracts/auth"
+	cachemock "github.com/goravel/framework/contracts/cache/mocks"
+	configmock "github.com/goravel/framework/contracts/config/mocks"
+	ormmock "github.com/goravel/framework/contracts/database/orm/mocks"
 	"github.com/goravel/framework/contracts/http"
 	"github.com/goravel/framework/database/orm"
-	cachemock "github.com/goravel/framework/mocks/cache"
-	configmock "github.com/goravel/framework/mocks/config"
-	ormmock "github.com/goravel/framework/mocks/database/orm"
 	"github.com/goravel/framework/support/carbon"
 )
 

diff --git a/auth/console/jwt_secret_command_test.go b/auth/console/jwt_secret_command_test.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	configmock "github.com/goravel/framework/mocks/config"
-	consolemocks "github.com/goravel/framework/mocks/console"
+	configmock "github.com/goravel/framework/contracts/config/mocks"
+	consolemocks "github.com/goravel/framework/contracts/console/mocks"
 	"github.com/goravel/framework/support"
 	"github.com/goravel/framework/support/file"
 )

diff --git a/auth/console/policy_make_command_test.go b/auth/console/policy_make_command_test.go
@@ -3,7 +3,7 @@ package console
 import (
 	"testing"
 
-	consolemocks "github.com/goravel/framework/mocks/console"
+	consolemocks "github.com/goravel/framework/contracts/console/mocks"
 	"github.com/goravel/framework/support/file"
 
 	"github.com/stretchr/testify/assert"

diff --git a/cache/driver_test.go b/cache/driver_test.go
@@ -8,8 +8,8 @@ import (
 	"github.com/stretchr/testify/suite"
 
 	"github.com/goravel/framework/contracts/cache"
-	configmock "github.com/goravel/framework/mocks/config"
-	logmock "github.com/goravel/framework/mocks/log"
+	configmock "github.com/goravel/framework/contracts/config/mocks"
+	logmock "github.com/goravel/framework/contracts/log/mocks"
 )
 
 type DriverTestSuite struct {
@@ -74,7 +74,7 @@ func (s *DriverTestSuite) TestStore() {
 type Store struct {
 }
 
-// Add Store an item in the cache if the key does not exist.
+//Add Store an item in the cache if the key does not exist.
 func (r *Store) Add(key string, value any, seconds time.Duration) bool {
 	return true
 }
@@ -83,47 +83,47 @@ func (r *Store) Decrement(key string, value ...int) (int, error) {
 	return 1, nil
 }
 
-// Forever Store an item in the cache indefinitely.
+//Forever Store an item in the cache indefinitely.
 func (r *Store) Forever(key string, value any) bool {
 	return true
 }
 
-// Forget Remove an item from the cache.
+//Forget Remove an item from the cache.
 func (r *Store) Forget(key string) bool {
 	return true
 }
 
-// Flush Remove all items from the cache.
+//Flush Remove all items from the cache.
 func (r *Store) Flush() bool {
 	return true
 }
 
-// Get Retrieve an item from the cache by key.
+//Get Retrieve an item from the cache by key.
 func (r *Store) Get(key string, def ...any) any {
 	return key
 }
 
-// Get Retrieve an item from the cache by key.
+//Get Retrieve an item from the cache by key.
 func (r *Store) GetBool(key string, def ...bool) bool {
 	return false
 }
 
-// Get Retrieve an item from the cache by key.
+//Get Retrieve an item from the cache by key.
 func (r *Store) GetInt(key string, def ...int) int {
 	return 1
 }
 
-// Get Retrieve an item from the cache by key.
+//Get Retrieve an item from the cache by key.
 func (r *Store) GetInt64(key string, def ...int64) int64 {
 	return 1
 }
 
-// Get Retrieve an item from the cache by key.
+//Get Retrieve an item from the cache by key.
 func (r *Store) GetString(key string, def ...string) string {
 	return ""
 }
 
-// Has Check an item exists in the cache.
+//Has Check an item exists in the cache.
 func (r *Store) Has(key string) bool {
 	return true
 }
@@ -136,22 +136,22 @@ func (r *Store) Lock(key string, second ...time.Duration) cache.Lock {
 	return nil
 }
 
-// Pull Retrieve an item from the cache and delete it.
+//Pull Retrieve an item from the cache and delete it.
 func (r *Store) Pull(key string, def ...any) any {
 	return def
 }
 
-// Put Store an item in the cache for a given number of seconds.
+//Put Store an item in the cache for a given number of seconds.
 func (r *Store) Put(key string, value any, seconds time.Duration) error {
 	return nil
 }
 
-// Remember Get an item from the cache, or execute the given Closure and store the result.
+//Remember Get an item from the cache, or execute the given Closure and store the result.
 func (r *Store) Remember(key string, ttl time.Duration, callback func() (any, error)) (any, error) {
 	return "", nil
 }
 
-// RememberForever Get an item from the cache, or execute the given Closure and store the result forever.
+//RememberForever Get an item from the cache, or execute the given Closure and store the result forever.
 func (r *Store) RememberForever(key string, callback func() (any, error)) (any, error) {
 	return "", nil
 }

diff --git a/cache/memory_test.go b/cache/memory_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/stretchr/testify/suite"
 
-	configmock "github.com/goravel/framework/mocks/config"
+	configmock "github.com/goravel/framework/contracts/config/mocks"
 )
 
 type MemoryTestSuite struct {

diff --git a/console/console/key_generate_command_test.go b/console/console/key_generate_command_test.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	configmock "github.com/goravel/framework/mocks/config"
-	consolemocks "github.com/goravel/framework/mocks/console"
+	configmock "github.com/goravel/framework/contracts/config/mocks"
+	consolemocks "github.com/goravel/framework/contracts/console/mocks"
 	"github.com/goravel/framework/support"
 	"github.com/goravel/framework/support/file"
 )

diff --git a/console/console/make_command_test.go b/console/console/make_command_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	consolemocks "github.com/goravel/framework/mocks/console"
+	consolemocks "github.com/goravel/framework/contracts/console/mocks"
 	"github.com/goravel/framework/support/file"
 )
 

diff --git a/contracts/auth/access/gate.go b/contracts/auth/access/gate.go
@@ -2,6 +2,7 @@ package access
 
 import "context"
 
+//go:generate mockery --name=Gate
 type Gate interface {
 	// WithContext returns a new Gate instance with the given context.
 	WithContext(ctx context.Context) Gate

diff --git a/mocks/auth/access/Gate.go → contracts/auth/access/mocks/Gate.go b/mocks/auth/access/Gate.go → contracts/auth/access/mocks/Gate.go
diff --git a/contracts/auth/auth.go b/contracts/auth/auth.go
@@ -6,6 +6,7 @@ import (
 	"github.com/goravel/framework/contracts/http"
 )
 
+//go:generate mockery --name=Auth
 type Auth interface {
 	// Guard attempts to get the guard against the local cache.
 	Guard(name string) Auth

diff --git a/mocks/auth/Auth.go → contracts/auth/mocks/Auth.go b/mocks/auth/Auth.go → contracts/auth/mocks/Auth.go
diff --git a/contracts/cache/cache.go b/contracts/cache/cache.go
@@ -5,11 +5,13 @@ import (
 	"time"
 )
 
+//go:generate mockery --name=Cache
 type Cache interface {
 	Driver
 	Store(name string) Driver
 }
 
+//go:generate mockery --name=Driver
 type Driver interface {
 	// Add an item in the cache if the key does not exist.
 	Add(key string, value any, t time.Duration) bool
@@ -49,6 +51,7 @@ type Driver interface {
 	WithContext(ctx context.Context) Driver
 }
 
+//go:generate mockery --name=Lock
 type Lock interface {
 	// Block attempt to acquire the lock for the given number of seconds.
 	Block(t time.Duration, callback ...func()) bool