fix tests

Author: dunglas

caddy/hotreload-skip.go

@@ -0,0 +1,6 @@
+//go:build nowatcher || nomercure
+package caddy
+
+func (_ *FrankenPHPModule) configureHotReload(_ *FrankenPHPApp) error {
+	return nil
+}

caddy/hotreload.go

@@ -0,0 +1,24 @@
+//go:build !nowatcher && !nomercure
+package caddy
+
+import (
+	"errors"
+	"net/url"
+
+	"github.com/dunglas/frankenphp"
+)
+
+func (f *FrankenPHPModule) configureHotReload(app *FrankenPHPApp) error {
+	if len(f.HotReload) == 0 {
+		return nil
+	}
+
+	if f.mercureHub == nil {
+		return errors.New("unable to enable hot reloading: no Mercure hub configured")
+	}
+
+	app.opts = append(app.opts, frankenphp.WithHotReload(f.Name, f.mercureHub, f.HotReload))
+	f.preparedEnv["FRANKENPHP_HOT_RELOAD\x00"] = "/.well-known/mercure?topic=https%3A%2F%2Ffrankenphp.dev%2Fhot-reload%2F" + url.QueryEscape(f.Name)
+
+	return nil
+}

caddy/mercure.go

@@ -3,9 +3,6 @@
 package caddy
 
 import (
-	"errors"
-	"net/url"
-
 	"github.com/caddyserver/caddy/v2"
 	"github.com/dunglas/frankenphp"
 	"github.com/dunglas/mercure"
@@ -20,21 +17,6 @@ type mercureContext struct {
 	mercureHub *mercure.Hub
 }
 
-func (f *FrankenPHPModule) configureHotReload(app *FrankenPHPApp) error {
-	if len(f.HotReload) == 0 {
-		return nil
-	}
-
-	if f.mercureHub == nil {
-		return errors.New("unable to enable hot reloading: no Mercure hub configured")
-	}
-
-	app.opts = append(app.opts, frankenphp.WithHotReload(f.Name, f.mercureHub, f.HotReload))
-	f.preparedEnv["FRANKENPHP_HOT_RELOAD\x00"] = "/.well-known/mercure?topic=https%3A%2F%2Ffrankenphp.dev%2Fhot-reload%2F" + url.QueryEscape(f.Name)
-
-	return nil
-}
-
 func (f *FrankenPHPModule) assignMercureHub(ctx caddy.Context) {
 	if f.mercureHub = mercureCaddy.FindHub(ctx.Modules()); f.mercureHub == nil {
 		return

frankenphp.go

@@ -37,8 +37,6 @@ import (
 	"unsafe"
 	// debug on Linux
 	//_ "github.com/ianlancetaylor/cgosymbolizer"
-
-	"github.com/dunglas/frankenphp/internal/watcher"
 )
 
 type contextKeyStruct struct{}
@@ -365,7 +363,7 @@ func Shutdown() {
 		fn()
 	}
 
-	watcher.DrainWatcher()
+	drainWatchers()
 	drainAutoScaling()
 	drainPHPThreads()
 

go.mod

@@ -7,6 +7,7 @@ retract v1.0.0-rc.1 // Human error
 require (
 	github.com/Masterminds/sprig/v3 v3.3.0
 	github.com/dunglas/mercure v0.21.2
+	github.com/e-dant/watcher/watcher-go v0.0.0-20251208164151-f88ec3b7e146
 	github.com/maypok86/otter/v2 v2.2.1
 	github.com/prometheus/client_golang v1.23.2
 	github.com/stretchr/testify v1.11.1
@@ -26,7 +27,6 @@ require (
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/dunglas/skipfilter v1.0.0 // indirect
-	github.com/e-dant/watcher/watcher-go v0.0.0-20251208164151-f88ec3b7e146 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fsnotify/fsnotify v1.9.0 // indirect
 	github.com/go-viper/mapstructure/v2 v2.4.0 // indirect

watcher-skip.go

@@ -2,6 +2,8 @@
 
 package frankenphp
 
+import "errors"
+
 type hotReloadOpt struct {
 }
 
@@ -16,3 +18,6 @@ func initWatchers(o *opt) error {
 
 	return nil
 }
+
+func drainWatchers() {
+}

watcher.go

@@ -41,3 +41,7 @@ func initWatchers(o *opt) error {
 
 	return watcher.InitWatcher(globalCtx, globalLogger, append(watchPatterns, o.hotReload...))
 }
+
+func drainWatchers() {
+	watcher.DrainWatcher()
+}