Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions config/application_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,10 @@ FLOAT_VALUE=3.14
`))
temp, err := os.CreateTemp("", "goravel.env")
assert.Nil(t, err)
defer temp.Close()
defer os.Remove(temp.Name())
defer func() {
_ = temp.Close()
_ = os.Remove(temp.Name())
}()

_, err = temp.Write([]byte(`
APP_KEY=12345678901234567890123456789012
Expand Down
2 changes: 1 addition & 1 deletion console/cli_helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ func helpName(fullName string) string {

func indent(spaces int, v string) string {
pad := strings.Repeat(" ", spaces)
return pad + strings.Replace(v, "\n", "\n"+pad, -1)
return pad + strings.ReplaceAll(v, "\n", "\n"+pad)
}

// lexicographicLess compares strings alphabetically considering case.
Expand Down
6 changes: 3 additions & 3 deletions console/console/build_command.go
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@ func (r *BuildCommand) Handle(ctx console.Context) error {
}

func (r *BuildCommand) build(system string, command []string) error {
os.Setenv("CGO_ENABLED", "0")
os.Setenv("GOOS", system)
os.Setenv("GOARCH", "amd64")
_ = os.Setenv("CGO_ENABLED", "0")
_ = os.Setenv("GOOS", system)
_ = os.Setenv("GOARCH", "amd64")

cmd := exec.Command(command[0], command[1:]...)
_, err := cmd.Output()
Expand Down
4 changes: 3 additions & 1 deletion database/db/query.go
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,9 @@ func (r *Query) Cursor() chan db.Row {
if rows, err = r.readBuilder.QueryxContext(r.ctx, sql, args...); err != nil {
return
}
defer rows.Close()
defer func() {
_ = rows.Close()
}()

for rows.Next() {
row := make(map[string]any)
Expand Down
4 changes: 2 additions & 2 deletions database/gorm/event.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ func (e *Event) IsDirty(columns ...string) bool {

if len(columns) == 0 {
for destColumn, destValue := range destOfMap {
if !(e.validColumn(destColumn) && e.validValue(destColumn, destValue)) {
if !e.validColumn(destColumn) || !e.validValue(destColumn, destValue) {
continue
}
if e.dirty(destColumn, destValue) {
Expand All @@ -79,7 +79,7 @@ func (e *Event) IsDirty(columns ...string) bool {
continue
}
for destColumn, destValue := range destOfMap {
if !(e.validColumn(destColumn) && e.validValue(destColumn, destValue)) {
if !e.validColumn(destColumn) || !e.validValue(destColumn, destValue) {
continue
}
if e.equalColumnName(column, destColumn) && e.dirty(destColumn, destValue) {
Expand Down
11 changes: 6 additions & 5 deletions database/gorm/query.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import (
"github.com/goravel/framework/contracts/config"
contractsdatabase "github.com/goravel/framework/contracts/database"
contractsdb "github.com/goravel/framework/contracts/database/db"
"github.com/goravel/framework/contracts/database/driver"
contractsdriver "github.com/goravel/framework/contracts/database/driver"
contractsorm "github.com/goravel/framework/contracts/database/orm"
"github.com/goravel/framework/contracts/log"
Expand All @@ -32,7 +31,7 @@ const Associations = clause.Associations
type Query struct {
config config.Config
ctx context.Context
grammar driver.Grammar
grammar contractsdriver.Grammar
log log.Log
instance *gormio.DB
queries map[string]*Query
Expand All @@ -47,7 +46,7 @@ func NewQuery(
config config.Config,
dbConfig contractsdatabase.Config,
db *gormio.DB,
grammar driver.Grammar,
grammar contractsdriver.Grammar,
log log.Log,
modelToObserver []contractsorm.ModelToObserver,
conditions *Conditions,
Expand All @@ -71,7 +70,7 @@ func NewQuery(
}

func BuildQuery(ctx context.Context, config config.Config, connection string, log log.Log, modelToObserver []contractsorm.ModelToObserver) (*Query, contractsdatabase.Config, error) {
driverCallback, exist := config.Get(fmt.Sprintf("database.connections.%s.via", connection)).(func() (driver.Driver, error))
driverCallback, exist := config.Get(fmt.Sprintf("database.connections.%s.via", connection)).(func() (contractsdriver.Driver, error))
if !exist {
return nil, contractsdatabase.Config{}, errors.DatabaseConfigNotFound
}
Expand Down Expand Up @@ -172,7 +171,9 @@ func (r *Query) Cursor() chan contractsdb.Row {
if rows, err = query.instance.Rows(); err != nil {
return
}
defer rows.Close()
defer func() {
_ = rows.Close()
}()

for rows.Next() {
val := make(map[string]any)
Expand Down
4 changes: 3 additions & 1 deletion filesystem/local.go
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,9 @@ func (r *Local) Put(file, content string) error {
if err != nil {
return err
}
defer f.Close()
defer func() {
_ = f.Close()
}()

if _, err = f.WriteString(content); err != nil {
return err
Expand Down
14 changes: 8 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
module github.com/goravel/framework

go 1.23.0
go 1.24.0

toolchain go1.24.6

require (
github.com/Masterminds/squirrel v1.5.4
github.com/brianvoe/gofakeit/v7 v7.3.0
github.com/charmbracelet/huh v0.7.0
github.com/charmbracelet/huh/spinner v0.0.0-20250714122654-40d2b68703eb
github.com/charmbracelet/huh/spinner v0.0.0-20250811123337-95b882db3fb0
github.com/charmbracelet/lipgloss v1.1.0
github.com/dave/dst v0.27.3
github.com/dromara/carbon/v2 v2.6.11
Expand All @@ -27,10 +29,10 @@ require (
github.com/spf13/cast v1.9.2
github.com/spf13/viper v1.20.1
github.com/stretchr/testify v1.10.0
github.com/urfave/cli/v3 v3.3.8
github.com/urfave/cli/v3 v3.4.1
github.com/vektra/mockery/v2 v2.53.2
golang.org/x/crypto v0.41.0
golang.org/x/exp v0.0.0-20250808145144-a408d31f581a
golang.org/x/exp v0.0.0-20250813145105-42675adae3e6
google.golang.org/grpc v1.74.2
google.golang.org/protobuf v1.36.7
gorm.io/gorm v1.30.1
Expand Down Expand Up @@ -110,6 +112,6 @@ require (
)

replace (
google.golang.org/genproto => google.golang.org/genproto v0.0.0-20250804133106-a7a43d27e69b
google.golang.org/genproto/googleapis/rpc => google.golang.org/genproto/googleapis/rpc v0.0.0-20250804133106-a7a43d27e69b
google.golang.org/genproto => google.golang.org/genproto v0.0.0-20250811230008-5f3141c8851a
google.golang.org/genproto/googleapis/rpc => google.golang.org/genproto/googleapis/rpc v0.0.0-20250811230008-5f3141c8851a
)
16 changes: 8 additions & 8 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc h1:4p
github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc/go.mod h1:X4/0JoqgTIPSFcRA/P6INZzIuyqdFY5rm8tb41s9okk=
github.com/charmbracelet/huh v0.7.0 h1:W8S1uyGETgj9Tuda3/JdVkc3x7DBLZYPZc4c+/rnRdc=
github.com/charmbracelet/huh v0.7.0/go.mod h1:UGC3DZHlgOKHvHC07a5vHag41zzhpPFj34U92sOmyuk=
github.com/charmbracelet/huh/spinner v0.0.0-20250714122654-40d2b68703eb h1:foK5EYUrChM3+7lK6qCEH43p/3oljGMtWtRq+tv3As4=
github.com/charmbracelet/huh/spinner v0.0.0-20250714122654-40d2b68703eb/go.mod h1:imftm8y+Db+rZ4Jcb6A7qJ0eOX78s9m84n8cdipC+R0=
github.com/charmbracelet/huh/spinner v0.0.0-20250811123337-95b882db3fb0 h1:6QlnBrg/NvjJ4j4AdnygSXGwARZO3H7e8K0gpQ9+9r4=
github.com/charmbracelet/huh/spinner v0.0.0-20250811123337-95b882db3fb0/go.mod h1:imftm8y+Db+rZ4Jcb6A7qJ0eOX78s9m84n8cdipC+R0=
github.com/charmbracelet/lipgloss v1.1.0 h1:vYXsiLHVkK7fp74RkV7b2kq9+zDLoEU4MZoFqR/noCY=
github.com/charmbracelet/lipgloss v1.1.0/go.mod h1:/6Q8FR2o+kj8rz4Dq0zQc3vYf7X+B0binUUBwA0aL30=
github.com/charmbracelet/x/ansi v0.9.3 h1:BXt5DHS/MKF+LjuK4huWrC6NCvHtexww7dMayh6GXd0=
Expand Down Expand Up @@ -249,8 +249,8 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
github.com/urfave/cli/v3 v3.3.8 h1:BzolUExliMdet9NlJ/u4m5vHSotJ3PzEqSAZ1oPMa/E=
github.com/urfave/cli/v3 v3.3.8/go.mod h1:FJSKtM/9AiiTOJL4fJ6TbMUkxBXn7GO9guZqoZtpYpo=
github.com/urfave/cli/v3 v3.4.1 h1:1M9UOCy5bLmGnuu1yn3t3CB4rG79Rtoxuv1sPhnm6qM=
github.com/urfave/cli/v3 v3.4.1/go.mod h1:FJSKtM/9AiiTOJL4fJ6TbMUkxBXn7GO9guZqoZtpYpo=
github.com/vektra/mockery/v2 v2.53.2 h1:4G/4fl9x722Yb8hLqH1YU3XZNRJFwl5KUMvpkmAyuC8=
github.com/vektra/mockery/v2 v2.53.2/go.mod h1:UJT+mgXhCcOCHXTnM5cJHCZL+d76BYB+EbY1sFztEB8=
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1zIOPMxZ5EncGwgmMJsa+9ucAQZXxsObs=
Expand All @@ -277,8 +277,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4=
golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc=
golang.org/x/exp v0.0.0-20250808145144-a408d31f581a h1:Y+7uR/b1Mw2iSXZ3G//1haIiSElDQZ8KWh0h+sZPG90=
golang.org/x/exp v0.0.0-20250808145144-a408d31f581a/go.mod h1:rT6SFzZ7oxADUDx58pcaKFTcZ+inxAa9fTrYx/uVYwg=
golang.org/x/exp v0.0.0-20250813145105-42675adae3e6 h1:SbTAbRFnd5kjQXbczszQ0hdk3ctwYf3qBNH9jIsGclE=
golang.org/x/exp v0.0.0-20250813145105-42675adae3e6/go.mod h1:4QTo5u+SEIbbKW1RacMZq1YEfOBqeXa19JeshGi+zc4=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/mod v0.27.0 h1:kb+q2PyFnEADO2IEF935ehFUXlWiNjJWtRNgBLSfbxQ=
Expand Down Expand Up @@ -333,8 +333,8 @@ golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
golang.org/x/tools v0.36.0 h1:kWS0uv/zsvHEle1LbV5LE8QujrxB3wfQyxHfhOk0Qkg=
golang.org/x/tools v0.36.0/go.mod h1:WBDiHKJK8YgLHlcQPYQzNCkUxUypCaa5ZegCVutKm+s=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/genproto/googleapis/rpc v0.0.0-20250804133106-a7a43d27e69b h1:zPKJod4w6F1+nRGDI9ubnXYhU9NSWoFAijkHkUXeTK8=
google.golang.org/genproto/googleapis/rpc v0.0.0-20250804133106-a7a43d27e69b/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
google.golang.org/genproto/googleapis/rpc v0.0.0-20250811230008-5f3141c8851a h1:tPE/Kp+x9dMSwUm/uM0JKK0IfdiJkwAbSMSeZBXXJXc=
google.golang.org/genproto/googleapis/rpc v0.0.0-20250811230008-5f3141c8851a/go.mod h1:gw1tLEfykwDz2ET4a12jcXt4couGAm7IwsVaTy0Sflo=
google.golang.org/grpc v1.74.2 h1:WoosgB65DlWVC9FqI82dGsZhWFNBSLjQ84bjROOpMu4=
google.golang.org/grpc v1.74.2/go.mod h1:CtQ+BGjaAIXHs/5YS3i473GqwBBa1zGQNevxdeBEXrM=
google.golang.org/protobuf v1.36.7 h1:IgrO7UwFQGJdRNXH/sQux4R1Dj1WAKcLElzeeRaXV2A=
Expand Down
4 changes: 3 additions & 1 deletion http/client/response.go
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,9 @@ func (r *Response) getContent() (string, error) {
return r.content, nil
}

defer r.response.Body.Close()
defer func() {
_ = r.response.Body.Close()
}()

content, err := io.ReadAll(r.response.Body)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion log/formatter/general.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ func (general *General) Format(entry *logrus.Entry) ([]byte, error) {
}

timestamp := carbon.FromStdTime(entry.Time).ToDateTimeMilliString()
b.WriteString(fmt.Sprintf("[%s] %s.%s: %s\n", timestamp, general.config.GetString("app.env"), entry.Level, entry.Message))
fmt.Fprintf(b, "[%s] %s.%s: %s\n", timestamp, general.config.GetString("app.env"), entry.Level, entry.Message)
data := entry.Data
if len(data) > 0 {
formattedData, err := general.formatData(data)
Expand Down
7 changes: 4 additions & 3 deletions log/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,12 @@ func getContextValues(ctx any, values map[any]any) {
reflectValue = reflect.NewAt(reflectValue.Type(), unsafe.Pointer(reflectValue.UnsafeAddr())).Elem()
reflectField := contextKeys.Field(i)

if reflectField.Name == "Context" {
switch reflectField.Name {
case "Context":
getContextValues(reflectValue.Interface(), values)
} else if reflectField.Name == "key" {
case "key":
value.Key = reflectValue.Interface()
} else if reflectField.Name == "val" {
case "val":
value.Val = reflectValue.Interface()
}
}
Expand Down
26 changes: 16 additions & 10 deletions mail/mail.go
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,10 @@ func NewEmailFromReader(r io.Reader) (*Email, error) {
continue
}
}
switch {
case ct == "text/plain":
switch ct {
case "text/plain":
e.Text = p.body
case ct == "text/html":
case "text/html":
e.HTML = p.body
}
}
Expand Down Expand Up @@ -284,7 +284,9 @@ func (e *Email) AttachFile(filename string) (a *Attachment, err error) {
if err != nil {
return
}
defer f.Close()
defer func() {
_ = f.Close()
}()

ct := mime.TypeByExtension(filepath.Ext(filename))
basename := filepath.Base(filename)
Expand Down Expand Up @@ -475,7 +477,7 @@ func (e *Email) Bytes() ([]byte, error) {
}

if isMixed || isAlternative {
relatedWriter.Close()
_ = relatedWriter.Close()
}
}
}
Expand Down Expand Up @@ -585,7 +587,9 @@ func (e *Email) SendWithTLS(addr string, a smtp.Auth, t *tls.Config) error {
if err != nil {
return err
}
defer c.Close()
defer func() {
_ = c.Close()
}()
if err = c.Hello("localhost"); err != nil {
return err
}
Expand Down Expand Up @@ -654,7 +658,9 @@ func (e *Email) SendWithStartTLS(addr string, a smtp.Auth, t *tls.Config) error
if err != nil {
return err
}
defer c.Close()
defer func() {
_ = c.Close()
}()
if err = c.Hello("localhost"); err != nil {
return err
}
Expand Down Expand Up @@ -759,10 +765,10 @@ func headerToBytes(buff io.Writer, header textproto.MIMEHeader) {
_, _ = io.WriteString(buff, field)
_, _ = io.WriteString(buff, ": ")
// Write the encoded header if needed
switch {
case field == "Content-Type" || field == "Content-Disposition":
switch field {
case "Content-Type", "Content-Disposition":
_, _ = buff.Write([]byte(subval))
case field == "From" || field == "To" || field == "Cc" || field == "Bcc":
case "From", "To", "Cc", "Bcc":
participants := strings.Split(subval, ",")
for i, v := range participants {
addr, err := mail.ParseAddress(v)
Expand Down
4 changes: 2 additions & 2 deletions queue/pending_job_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ func (s *PendingJobTestSuite) TestNewPendingJob() {
s.Equal("default", pendingJob.connection)
s.Equal("default", pendingJob.queue)
s.NotEmpty(pendingJob.task.UUID)
s.Equal(&TestJobOne{}, pendingJob.task.ChainJob.Job)
s.Equal(&TestJobOne{}, pendingJob.task.Job)
s.Equal(args, pendingJob.task.Args)
s.True(pendingJob.delay.IsZero())
})
Expand All @@ -165,7 +165,7 @@ func (s *PendingJobTestSuite) TestNewPendingJob() {
s.Equal("default", pendingJob.connection)
s.Equal("default", pendingJob.queue)
s.NotEmpty(pendingJob.task.UUID)
s.Equal(&TestJobOne{}, pendingJob.task.ChainJob.Job)
s.Equal(&TestJobOne{}, pendingJob.task.Job)
s.Empty(pendingJob.task.Args)
s.True(pendingJob.delay.IsZero())
})
Expand Down
2 changes: 1 addition & 1 deletion queue/utils/convert.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ func JsonToTask(payload string, jobStorer contractsqueue.JobStorer, json foundat
chain = append(chain, jobs)
}

job, err := jobStorer.Get(task.Job.Signature)
job, err := jobStorer.Get(task.Signature)
if err != nil {
return contractsqueue.Task{}, err
}
Expand Down
2 changes: 1 addition & 1 deletion session/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ func NewManager(config config.Config, json foundation.Json) *Manager {

err := manager.registerDriver(defaultDriver)
if err != nil {
color.Errorf(errors.SessionDriverRegisterFailed.Args(err).Error())
color.Errorln(errors.SessionDriverRegisterFailed.Args(err).Error())
}
return manager
}
Expand Down
2 changes: 1 addition & 1 deletion session/manager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ func (s *ManagerTestSuite) SetupTest() {
func (s *ManagerTestSuite) TearDownSuite() {
testPath := "storage/framework"
if _, err := os.Stat(testPath); err == nil {
os.RemoveAll(testPath)
_ = os.RemoveAll(testPath)
}
s.mockConfig.AssertExpectations(s.T())
}
Expand Down
6 changes: 3 additions & 3 deletions support/debug/dump.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func Dump(v ...any) {
// DumpHTML is used to display detailed information about variables in HTML format
func DumpHTML(v ...any) {
output := dumper.DumpHTML(v...)
fmt.Fprintln(writer, output)
_, _ = fmt.Fprintln(writer, output)
}

// DumpJSON is used to display detailed information about variables in JSON format
Expand All @@ -44,13 +44,13 @@ func FDump(w io.Writer, v ...any) {
// FDumpHTML is used to display detailed information about variables in HTML format to the specified io.Writer
func FDumpHTML(w io.Writer, v ...any) {
output := dumper.DumpHTML(v...)
fmt.Fprintln(w, output)
_, _ = fmt.Fprintln(w, output)
}

// FDumpJSON is used to display detailed information about variables in JSON format to the specified io.Writer
func FDumpJSON(w io.Writer, v ...any) {
output := dumper.DumpJSONStr(v...)
fmt.Fprintln(w, output)
_, _ = fmt.Fprintln(w, output)
}

// SDump is used to display detailed information about variables as a string
Expand Down
Loading
Loading