extract the root from the site block (get rid of double root directive)

caddy/admin_test.go

@@ -213,8 +213,8 @@ func TestAutoScaleRegularThreadsOnAutomaticThreadLimit(t *testing.T) {
 		wg.Add(requestsPerTry)
 		for range requestsPerTry {
 			go func() {
+				defer wg.Done()
 				tester.AssertGetResponse(endpoint, http.StatusOK, "slept for 2 ms and worked for 1000 iterations")
-				wg.Done()
 			}()
 		}
 		wg.Wait()

caddy/caddy_test.go

@@ -462,6 +462,43 @@ func TestPHPServerDirective(t *testing.T) {
 	tester.AssertGetResponse("http://localhost:"+testPort+"/not-found.txt", http.StatusOK, "I am by birth a Genevese (i not set)")
 }
 
+func TestPHPServerDirectiveWorkers(t *testing.T) {
+	t.Setenv("ONE", "one")
+	t.Setenv("TWO", "two")
+	tester := caddytest.NewTester(t)
+	initServer(t, tester, `
+		{
+			skip_install_trust
+			admin localhost:2999
+			http_port `+testPort+`
+			https_port 9443
+			frankenphp {
+				php_ini variables_order "EGPCS" # populate $_ENV
+			}
+		}
+
+		localhost:`+testPort+` {
+			@env path /env.php*
+			php_server @env {
+				root ../testdata/env # self defined root
+				worker env.php
+			}
+			root ../testdata
+			handle /index.php {
+				root ../testdata/dirindex
+				php_server # inherits from root ../testdata/dirindex 
+			}
+			php_server {
+				worker worker-with-counter.php # inherits from root ../testdata
+			}
+		}
+		`, "caddyfile")
+
+	tester.AssertGetResponse("http://localhost:"+testPort+"/worker-with-counter.php", http.StatusOK, "requests:1")
+	tester.AssertGetResponse("http://localhost:"+testPort+"/index.php", http.StatusOK, "Hello from directory index.php")
+	tester.AssertGetResponse("http://localhost:"+testPort+"/env.php?keys[]=ONE&keys[]=TWO", http.StatusOK, "ONE=one,TWO=two")
+}
+
 func TestPHPServerDirectiveDisableFileServer(t *testing.T) {
 	tester := caddytest.NewTester(t)
 	initServer(t, tester, `

caddy/go.mod

@@ -7,7 +7,7 @@ replace github.com/dunglas/frankenphp => ../
 retract v1.0.0-rc.1 // Human error
 
 require (
-	github.com/caddyserver/caddy/v2 v2.11.2
+	github.com/caddyserver/caddy/v2 v2.11.3-0.20260328174442-62e9c052648f
 	github.com/caddyserver/certmagic v0.25.2
 	github.com/dunglas/caddy-cbrotli v1.0.1
 	github.com/dunglas/frankenphp v1.12.1

caddy/go.sum

@@ -95,8 +95,8 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bits-and-blooms/bitset v1.24.4 h1:95H15Og1clikBrKr/DuzMXkQzECs1M6hhoGXLwLQOZE=
 github.com/bits-and-blooms/bitset v1.24.4/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
-github.com/caddyserver/caddy/v2 v2.11.2 h1:iOlpsSiSKqEW+SIXrcZsZ/NO74SzB/ycqqvAIEfIm64=
-github.com/caddyserver/caddy/v2 v2.11.2/go.mod h1:ASNYYmKhIVWWMGPfNxclI5DqKEgU3FhmL+6NZWzQEag=
+github.com/caddyserver/caddy/v2 v2.11.3-0.20260328174442-62e9c052648f h1:UmlXx5sytQ3IwWTA8kN/e9AJyaKgeZ2N1jEInipX3HQ=
+github.com/caddyserver/caddy/v2 v2.11.3-0.20260328174442-62e9c052648f/go.mod h1:eu0tCpKfbDkztZ5znboBOWG95MaypGCiEe2+455hZIA=
 github.com/caddyserver/certmagic v0.25.2 h1:D7xcS7ggX/WEY54x0czj7ioTkmDWKIgxtIi2OcQclUc=
 github.com/caddyserver/certmagic v0.25.2/go.mod h1:llW/CvsNmza8S6hmsuggsZeiX+uS27dkqY27wDIuBWg=
 github.com/caddyserver/zerossl v0.1.5 h1:dkvOjBAEEtY6LIGAHei7sw2UgqSD6TrWweXpV7lvEvE=

caddy/module.go

@@ -35,7 +35,7 @@ type FrankenPHPModule struct {
 	mercureContext
 	hotReloadContext
 
-	// Root sets the root folder to the site. Default: `root` directive, or the path of the public directory of the embed app it exists.
+	// Root sets the root folder to the site. Default: site `root` directive, or the path of the public directory of the embed app it exists.
 	Root string `json:"root,omitempty"`
 	// SplitPath sets the substrings for splitting the URI into two parts. The first matching substring will be used to split the "path info" from the path. The first piece is suffixed with the matching substring and will be assumed as the actual resource (CGI script) name. The second piece will be set to PATH_INFO for the CGI script to use. Default: `.php`.
 	SplitPath []string `json:"split_path,omitempty"`
@@ -261,6 +261,7 @@ func (f *FrankenPHPModule) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
 		for d.NextBlock(0) {
 			switch d.Val() {
 			case "root":
+				caddy.Log().Named("caddyfile").Warn("DEPRECATED: the 'root' subdirective of 'php'/'php_server' is deprecated, use the 'root' directive in the site block instead")
 				if !d.NextArg() {
 					return d.ArgErr()
 				}
@@ -418,6 +419,7 @@ func parsePhpServer(h httpcaddyfile.Helper) ([]httpcaddyfile.ConfigValue, error)
 			// parse the php_server subdirectives
 			switch dispenser.Val() {
 			case "root":
+				caddy.Log().Named("caddyfile").Warn("DEPRECATED: the 'root' subdirective of 'php_server' is deprecated, use the 'root' directive in the site block instead")
 				if !dispenser.NextArg() {
 					return nil, dispenser.ArgErr()
 				}
@@ -470,6 +472,16 @@ func parsePhpServer(h httpcaddyfile.Helper) ([]httpcaddyfile.ConfigValue, error)
 		return nil, err
 	}
 
+	// If no root was specified inside php_server, inherit it from the site-level root directive.
+	// Skip roots containing placeholders (e.g. {env.APP_ROOT}).
+	// We can check for `{` here because {$ENV} vars are already resolved earlier
+	if phpsrv.Root == "" {
+		if siteRoot := extractSiteRoot(h); siteRoot != "" && !strings.Contains(siteRoot, "{") {
+			phpsrv.Root = siteRoot
+			fsrv.Root = siteRoot
+		}
+	}
+
 	if frankenphp.EmbeddedAppPath != "" {
 		if phpsrv.Root == "" {
 			phpsrv.Root = filepath.Join(frankenphp.EmbeddedAppPath, defaultDocumentRoot)
@@ -675,6 +687,14 @@ func prependWorkerRoutes(routes caddyhttp.RouteList, h httpcaddyfile.Helper, f F
 	return routes
 }
 
+func extractSiteRoot(h httpcaddyfile.Helper) string {
+	// Caddy stores only unmatched or wildcard matcher roots
+	if root, ok := h.BlockState["root"].(string); ok {
+		return root
+	}
+	return ""
+}
+
 // Interface guards
 var (
 	_ caddy.Provisioner           = (*FrankenPHPModule)(nil)