rnsrk/wisski-cloud-distillery
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bump pkglib to go1.22 version

Browse source
This commit is contained in:
Tom Wiesing 2024-04-08 23:37:04 +02:00
parent 84799afda2
commit 2d1f3e3819
No known key found for this signature in database
9 changed files with 31 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

3
internal/phpx/marshal.go
View file

@ -138,11 +138,12 @@ func MarshalMap(m map[string]any) string {
var builder strings.Builder
builder.WriteString("array(")
collection.IterateSorted(m, func(k string, v any) {
collection.IterateSorted(m, func(k string, v any) bool {
builder.WriteString(MarshalString(k))
builder.WriteString("=>")
builder.WriteString(MarshalJSON(v))
builder.WriteString(",")
return true
})
builder.WriteString(")")

6
internal/phpx/server.go
View file

@ -9,12 +9,12 @@ import (
"io"
"os"
"regexp"
"slices"
"strings"
"sync"
_ "embed"
"github.com/tkw1536/pkglib/collection"
"github.com/tkw1536/pkglib/lazy"
"github.com/tkw1536/pkglib/status"
"github.com/tkw1536/pkglib/stream"
@ -285,8 +285,8 @@ func init() {
}
// remove comment lines
lines = collection.Filter(lines, func(line string) bool {
return !strings.HasPrefix(line, "//")
lines = slices.DeleteFunc(lines, func(line string) bool {
return strings.HasPrefix(line, "//")
})
serverPHP = minifier.ReplaceAllString(strings.Join(lines, ""), "$1")