upgrade

Author: dunglas

caddy/go.sum

@@ -470,6 +470,7 @@ github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/slackhq/nebula v1.9.6 h1:Fl0LE2dHDeVEK3R+un59Z3V4ZzbZ6q2e/zF4ClaD5yo=
 github.com/slackhq/nebula v1.9.6/go.mod h1:1+4q4wd3dDAjO8rKCttSb9JIVbklQhuJiBp5I0lbIsQ=
+github.com/slackhq/nebula v1.9.7 h1:v5u46efIyYHGdfjFnozQbRRhMdaB9Ma1SSTcUcE2lfE=
 github.com/slackhq/nebula v1.9.7/go.mod h1:1+4q4wd3dDAjO8rKCttSb9JIVbklQhuJiBp5I0lbIsQ=
 github.com/smallstep/assert v0.0.0-20200723003110-82e2b9b3b262 h1:unQFBIznI+VYD1/1fApl1A+9VcBk+9dcqGfnePY87LY=
 github.com/smallstep/assert v0.0.0-20200723003110-82e2b9b3b262/go.mod h1:MyOHs9Po2fbM1LHej6sBUT8ozbxmMOFG+E+rx/GSGuc=

caddy/module.go

@@ -19,7 +19,6 @@ import (
 	"github.com/caddyserver/caddy/v2/modules/caddyhttp/rewrite"
 	"github.com/dunglas/frankenphp"
 	"github.com/dunglas/frankenphp/internal/fastabs"
-	"github.com/dunglas/mercure"
 	mercureCaddy "github.com/dunglas/mercure/caddy"
 )
 
@@ -298,25 +297,10 @@ func (f *FrankenPHPModule) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
 }
 
 func (f *FrankenPHPModule) assignMercureHubRequestOption(ctx caddy.Context) {
-	var hub *mercure.Hub
-	for _, m := range ctx.Modules() {
-		if h, ok := mercureCaddy.Hubs[m]; ok {
-			hub = h
-
-			break
-		}
-	}
-
-	if h, ok := mercureCaddy.Hubs[nil]; ok {
-		hub = h
-	}
-
-	if hub == nil {
-		return
+	if hub := mercureCaddy.FindHub(ctx.Modules()); hub != nil {
+		opt := frankenphp.WithMercureHub(hub)
+		f.mercureHubRequestOption = &opt
 	}
-
-	opt := frankenphp.WithMercureHub(hub)
-	f.mercureHubRequestOption = &opt
 }
 
 // parseCaddyfile unmarshals tokens from h into a new Middleware.