Skip to content

Commit 2a41b86

Browse files
committed
feat: mercure_publish() PHP function to dispatch Mercure updates
# Conflicts: # types.go # types_test.go
1 parent fb1f468 commit 2a41b86

14 files changed

Lines changed: 439 additions & 78 deletions

.clang-format-ignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
frankenphp_arginfo.h

.gitleaksignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
/github/workspace/docs/mercure.md:jwt:65
1+
/github/workspace/docs/mercure.md:jwt:88

caddy/go.mod

Lines changed: 47 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,19 @@ go 1.25.0
44

55
replace github.com/dunglas/frankenphp => ../
66

7+
replace (
8+
github.com/dunglas/mercure => ../../mercure
9+
github.com/dunglas/mercure/caddy => ../../mercure/caddy
10+
)
11+
712
retract v1.0.0-rc.1 // Human error
813

914
require (
1015
github.com/caddyserver/caddy/v2 v2.10.2
1116
github.com/caddyserver/certmagic v0.25.0
1217
github.com/dunglas/caddy-cbrotli v1.0.1
1318
github.com/dunglas/frankenphp v1.9.1
19+
github.com/dunglas/mercure v0.20.2
1420
github.com/dunglas/mercure/caddy v0.20.2
1521
github.com/dunglas/vulcain/caddy v1.2.1
1622
github.com/prometheus/client_golang v1.23.2
@@ -24,7 +30,7 @@ require (
2430
cel.dev/expr v0.24.0 // indirect
2531
cloud.google.com/go/auth v0.16.5 // indirect
2632
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
27-
cloud.google.com/go/compute/metadata v0.8.0 // indirect
33+
cloud.google.com/go/compute/metadata v0.9.0 // indirect
2834
dario.cat/mergo v1.0.2 // indirect
2935
filippo.io/edwards25519 v1.1.0 // indirect
3036
github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 // indirect
@@ -34,10 +40,11 @@ require (
3440
github.com/Masterminds/semver/v3 v3.4.0 // indirect
3541
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
3642
github.com/MauriceGit/skiplist v0.0.0-20211105230623-77f5c8d3e145 // indirect
37-
github.com/MicahParks/jwkset v0.9.6 // indirect
38-
github.com/MicahParks/keyfunc/v3 v3.6.1 // indirect
43+
github.com/MicahParks/jwkset v0.11.0 // indirect
44+
github.com/MicahParks/keyfunc/v3 v3.6.2 // indirect
3945
github.com/Microsoft/go-winio v0.6.2 // indirect
4046
github.com/RoaringBitmap/roaring v1.9.4 // indirect
47+
github.com/RoaringBitmap/roaring/v2 v2.10.0 // indirect
4148
github.com/alecthomas/chroma/v2 v2.20.0 // indirect
4249
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
4350
github.com/aryann/difflib v0.0.0-20210328193216-ff5ff6dc229b // indirect
@@ -60,7 +67,7 @@ require (
6067
github.com/dlclark/regexp2 v1.11.5 // indirect
6168
github.com/dolthub/maphash v0.1.0 // indirect
6269
github.com/dunglas/httpsfv v1.1.0 // indirect
63-
github.com/dunglas/mercure v0.20.2 // indirect
70+
github.com/dunglas/skipfilter v1.0.0 // indirect
6471
github.com/dunglas/vulcain v1.2.1 // indirect
6572
github.com/dustin/go-humanize v1.0.1 // indirect
6673
github.com/felixge/httpsnoop v1.0.4 // indirect
@@ -86,7 +93,7 @@ require (
8693
github.com/google/brotli/go/cbrotli v1.1.0 // indirect
8794
github.com/google/cel-go v0.26.1 // indirect
8895
github.com/google/certificate-transparency-go v1.3.2 // indirect
89-
github.com/google/go-tpm v0.9.5 // indirect
96+
github.com/google/go-tpm v0.9.6 // indirect
9097
github.com/google/go-tspi v0.3.0 // indirect
9198
github.com/google/s2a-go v0.1.9 // indirect
9299
github.com/google/uuid v1.6.0 // indirect
@@ -100,7 +107,7 @@ require (
100107
github.com/inconshreveable/mousetrap v1.1.0 // indirect
101108
github.com/jackc/pgpassfile v1.0.0 // indirect
102109
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
103-
github.com/jackc/pgx/v5 v5.7.5 // indirect
110+
github.com/jackc/pgx/v5 v5.7.6 // indirect
104111
github.com/jackc/puddle/v2 v2.2.2 // indirect
105112
github.com/josharian/intern v1.0.0 // indirect
106113
github.com/kevburnsjr/skipfilter v0.0.1 // indirect
@@ -113,8 +120,9 @@ require (
113120
github.com/mattn/go-colorable v0.1.14 // indirect
114121
github.com/mattn/go-isatty v0.0.20 // indirect
115122
github.com/maypok86/otter v1.2.4 // indirect
123+
github.com/maypok86/otter/v2 v2.2.1 // indirect
116124
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
117-
github.com/mholt/acmez/v3 v3.1.3 // indirect
125+
github.com/mholt/acmez/v3 v3.1.4 // indirect
118126
github.com/miekg/dns v1.1.68 // indirect
119127
github.com/mitchellh/copystructure v1.2.0 // indirect
120128
github.com/mitchellh/go-ps v1.0.0 // indirect
@@ -134,26 +142,26 @@ require (
134142
github.com/prometheus/common v0.66.1 // indirect
135143
github.com/prometheus/procfs v0.17.0 // indirect
136144
github.com/quic-go/qpack v0.5.1 // indirect
137-
github.com/quic-go/quic-go v0.54.0 // indirect
145+
github.com/quic-go/quic-go v0.54.1 // indirect
138146
github.com/rs/xid v1.6.0 // indirect
139147
github.com/russross/blackfriday/v2 v2.1.0 // indirect
140-
github.com/sagikazarmark/locafero v0.10.0 // indirect
148+
github.com/sagikazarmark/locafero v0.12.0 // indirect
141149
github.com/shopspring/decimal v1.4.0 // indirect
142150
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
143151
github.com/sirupsen/logrus v1.9.3 // indirect
144-
github.com/slackhq/nebula v1.9.6 // indirect
152+
github.com/slackhq/nebula v1.9.7 // indirect
145153
github.com/smallstep/certificates v0.28.4 // indirect
146154
github.com/smallstep/cli-utils v0.12.1 // indirect
147-
github.com/smallstep/linkedca v0.23.0 // indirect
155+
github.com/smallstep/linkedca v0.24.0 // indirect
148156
github.com/smallstep/nosql v0.7.0 // indirect
149157
github.com/smallstep/pkcs7 v0.2.1 // indirect
150158
github.com/smallstep/scep v0.0.0-20250318231241-a25cabb69492 // indirect
151159
github.com/smallstep/truststore v0.13.0 // indirect
152160
github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect
153-
github.com/spf13/afero v1.14.0 // indirect
154-
github.com/spf13/cast v1.9.2 // indirect
161+
github.com/spf13/afero v1.15.0 // indirect
162+
github.com/spf13/cast v1.10.0 // indirect
155163
github.com/spf13/pflag v1.0.10 // indirect
156-
github.com/spf13/viper v1.20.1 // indirect
164+
github.com/spf13/viper v1.21.0 // indirect
157165
github.com/stoewer/go-strcase v1.3.1 // indirect
158166
github.com/subosito/gotenv v1.6.0 // indirect
159167
github.com/tailscale/tscert v0.0.0-20240608151842-d3f834017e53 // indirect
@@ -170,45 +178,46 @@ require (
170178
github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc // indirect
171179
github.com/zeebo/blake3 v0.2.4 // indirect
172180
go.etcd.io/bbolt v1.4.3 // indirect
173-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
174-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 // indirect
175-
go.opentelemetry.io/contrib/propagators/autoprop v0.62.0 // indirect
176-
go.opentelemetry.io/contrib/propagators/aws v1.37.0 // indirect
177-
go.opentelemetry.io/contrib/propagators/b3 v1.37.0 // indirect
178-
go.opentelemetry.io/contrib/propagators/jaeger v1.37.0 // indirect
179-
go.opentelemetry.io/contrib/propagators/ot v1.37.0 // indirect
180-
go.opentelemetry.io/otel v1.37.0 // indirect
181-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0 // indirect
182-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0 // indirect
183-
go.opentelemetry.io/otel/metric v1.37.0 // indirect
184-
go.opentelemetry.io/otel/sdk v1.37.0 // indirect
185-
go.opentelemetry.io/otel/trace v1.37.0 // indirect
186-
go.opentelemetry.io/proto/otlp v1.7.1 // indirect
181+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
182+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
183+
go.opentelemetry.io/contrib/propagators/autoprop v0.63.0 // indirect
184+
go.opentelemetry.io/contrib/propagators/aws v1.38.0 // indirect
185+
go.opentelemetry.io/contrib/propagators/b3 v1.38.0 // indirect
186+
go.opentelemetry.io/contrib/propagators/jaeger v1.38.0 // indirect
187+
go.opentelemetry.io/contrib/propagators/ot v1.38.0 // indirect
188+
go.opentelemetry.io/otel v1.38.0 // indirect
189+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 // indirect
190+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0 // indirect
191+
go.opentelemetry.io/otel/metric v1.38.0 // indirect
192+
go.opentelemetry.io/otel/sdk v1.38.0 // indirect
193+
go.opentelemetry.io/otel/trace v1.38.0 // indirect
194+
go.opentelemetry.io/proto/otlp v1.8.0 // indirect
187195
go.step.sm/crypto v0.70.0 // indirect
188196
go.uber.org/automaxprocs v1.6.0 // indirect
189197
go.uber.org/mock v0.6.0 // indirect
190198
go.uber.org/multierr v1.11.0 // indirect
191199
go.uber.org/zap v1.27.0 // indirect
192200
go.uber.org/zap/exp v0.3.0 // indirect
193-
go.yaml.in/yaml/v2 v2.4.2 // indirect
201+
go.yaml.in/yaml/v2 v2.4.3 // indirect
202+
go.yaml.in/yaml/v3 v3.0.4 // indirect
194203
golang.org/x/crypto v0.42.0 // indirect
195-
golang.org/x/crypto/x509roots/fallback v0.0.0-20250826074233-8f580defa01d // indirect
196-
golang.org/x/exp v0.0.0-20250819193227-8b4c13bb791b // indirect
204+
golang.org/x/crypto/x509roots/fallback v0.0.0-20250927194341-2beaa59a3c99 // indirect
205+
golang.org/x/exp v0.0.0-20250911091902-df9299821621 // indirect
197206
golang.org/x/mod v0.28.0 // indirect
198207
golang.org/x/net v0.44.0 // indirect
199-
golang.org/x/oauth2 v0.30.0 // indirect
208+
golang.org/x/oauth2 v0.31.0 // indirect
200209
golang.org/x/sync v0.17.0 // indirect
201210
golang.org/x/sys v0.36.0 // indirect
202211
golang.org/x/term v0.35.0 // indirect
203212
golang.org/x/text v0.29.0 // indirect
204-
golang.org/x/time v0.12.0 // indirect
213+
golang.org/x/time v0.13.0 // indirect
205214
golang.org/x/tools v0.37.0 // indirect
206-
google.golang.org/api v0.248.0 // indirect
207-
google.golang.org/genproto/googleapis/api v0.0.0-20250826171959-ef028d996bc1 // indirect
208-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250826171959-ef028d996bc1 // indirect
209-
google.golang.org/grpc v1.75.0 // indirect
215+
google.golang.org/api v0.251.0 // indirect
216+
google.golang.org/genproto/googleapis/api v0.0.0-20250929231259-57b25ae835d4 // indirect
217+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250929231259-57b25ae835d4 // indirect
218+
google.golang.org/grpc v1.75.1 // indirect
210219
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1 // indirect
211-
google.golang.org/protobuf v1.36.8 // indirect
220+
google.golang.org/protobuf v1.36.9 // indirect
212221
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
213222
gopkg.in/yaml.v3 v3.0.1 // indirect
214223
howett.net/plist v1.0.1 // indirect

0 commit comments

Comments
 (0)