fix relative paths not being resolved correctly by spc (#2093)

closes #2092
closes #2064

build-static.sh

@@ -178,7 +178,11 @@ fi
 
 # Embed PHP app, if any
 if [ -n "${EMBED}" ] && [ -d "${EMBED}" ]; then
-	SPC_OPT_BUILD_ARGS="${SPC_OPT_BUILD_ARGS} --with-frankenphp-app=${EMBED}"
+	if [[ "${EMBED}" != /* ]]; then
+		EMBED="${CURRENT_DIR}/${EMBED}"
+	fi
+	# shellcheck disable=SC2089
+	SPC_OPT_BUILD_ARGS="${SPC_OPT_BUILD_ARGS} --with-frankenphp-app='${EMBED}'"
 fi
 
 SPC_OPT_INSTALL_ARGS="go-xcaddy"
@@ -204,7 +208,7 @@ done
 # shellcheck disable=SC2086
 ${spcCommand} download --with-php="${PHP_VERSION}" --for-extensions="${PHP_EXTENSIONS}" --for-libs="${PHP_EXTENSION_LIBS}" ${SPC_OPT_DOWNLOAD_ARGS}
 export FRANKENPHP_SOURCE_PATH="${CURRENT_DIR}"
-# shellcheck disable=SC2086
+# shellcheck disable=SC2086,SC2090
 ${spcCommand} build --enable-zts --build-embed --build-frankenphp ${SPC_OPT_BUILD_ARGS} "${PHP_EXTENSIONS}" --with-libs="${PHP_EXTENSION_LIBS}"
 
 if [ -n "$CI" ]; then

caddy/caddy_test.go

@@ -1472,3 +1472,31 @@ func TestDd(t *testing.T) {
 		"dump123",
 	)
 }
+
+func TestLog(t *testing.T) {
+	tester := caddytest.NewTester(t)
+	tester.InitServer(`
+		{
+			skip_install_trust
+			admin localhost:2999
+		}
+
+		http://localhost:`+testPort+` {
+			log {
+				output stdout
+				format json
+			}
+
+			root ../testdata
+			php_server {
+				worker ../testdata/log-frankenphp_log.php
+			}
+		}
+		`, "caddyfile")
+
+	tester.AssertGetResponse(
+		"http://localhost:"+testPort+"/log-frankenphp_log.php?i=0",
+		http.StatusOK,
+		"",
+	)
+}

caddy/go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/caddyserver/caddy/v2 v2.10.2
 	github.com/caddyserver/certmagic v0.25.0
 	github.com/dunglas/caddy-cbrotli v1.0.1
-	github.com/dunglas/frankenphp v1.11.0
+	github.com/dunglas/frankenphp v1.11.1
 	github.com/dunglas/mercure v0.21.4
 	github.com/dunglas/mercure/caddy v0.21.4
 	github.com/dunglas/vulcain/caddy v1.2.1

caddy/hotreload.go

@@ -55,11 +55,8 @@ func (f *FrankenPHPModule) configureHotReload(app *FrankenPHPApp) error {
 }
 
 func (f *FrankenPHPModule) unmarshalHotReload(d *caddyfile.Dispenser) error {
-	patterns := d.RemainingArgs()
-	if len(patterns) > 0 {
-		f.HotReload = &hotReloadConfig{
-			Watch: patterns,
-		}
+	f.HotReload = &hotReloadConfig{
+		Watch: d.RemainingArgs(),
 	}
 
 	for d.NextBlock(1) {
@@ -81,10 +78,6 @@ func (f *FrankenPHPModule) unmarshalHotReload(d *caddyfile.Dispenser) error {
 				return d.ArgErr()
 			}
 
-			if f.HotReload == nil {
-				f.HotReload = &hotReloadConfig{}
-			}
-
 			f.HotReload.Watch = append(f.HotReload.Watch, patterns...)
 
 		default:

frankenphp.c

@@ -554,10 +554,10 @@ PHP_FUNCTION(frankenphp_log) {
   zend_long level = 0;
   zval *context = NULL;
 
-  ZEND_PARSE_PARAMETERS_START(2, 3)
+  ZEND_PARSE_PARAMETERS_START(1, 3)
   Z_PARAM_STR(message)
-  Z_PARAM_LONG(level)
   Z_PARAM_OPTIONAL
+  Z_PARAM_LONG(level)
   Z_PARAM_ARRAY(context)
   ZEND_PARSE_PARAMETERS_END();
 

frankenphp.go

@@ -660,10 +660,28 @@ func go_read_cookies(threadIndex C.uintptr_t) *C.char {
 	return C.CString(cookie)
 }
 
+func getLogger(threadIndex C.uintptr_t) (*slog.Logger, context.Context) {
+	ctxHolder := phpThreads[threadIndex]
+	if ctxHolder == nil {
+		return globalLogger, globalCtx
+	}
+
+	ctx := ctxHolder.context()
+	if ctxHolder.handler == nil {
+		return globalLogger, ctx
+	}
+
+	fCtx := ctxHolder.frankenPHPContext()
+	if fCtx == nil || fCtx.logger == nil {
+		return globalLogger, ctx
+	}
+
+	return fCtx.logger, ctx
+}
+
 //export go_log
 func go_log(threadIndex C.uintptr_t, message *C.char, level C.int) {
-	ctx := phpThreads[threadIndex].context()
-	logger := phpThreads[threadIndex].frankenPHPContext().logger
+	logger, ctx := getLogger(threadIndex)
 
 	m := C.GoString(message)
 	le := syslogLevelInfo
@@ -697,8 +715,7 @@ func go_log(threadIndex C.uintptr_t, message *C.char, level C.int) {
 
 //export go_log_attrs
 func go_log_attrs(threadIndex C.uintptr_t, message *C.zend_string, cLevel C.zend_long, cAttrs *C.zval) *C.char {
-	ctx := phpThreads[threadIndex].context()
-	logger := phpThreads[threadIndex].frankenPHPContext().logger
+	logger, ctx := getLogger(threadIndex)
 
 	level := slog.Level(cLevel)
 

frankenphp_test.go

@@ -447,6 +447,7 @@ func testLog_frankenphp_log(t *testing.T, opts *testOptions) {
 
 		logs := buf.String()
 		for _, message := range []string{
+			`level=INFO msg="default level message"`,
 			fmt.Sprintf(`level=DEBUG msg="some debug message %d" "key int"=1`, i),
 			fmt.Sprintf(`level=INFO msg="some info message %d" "key string"=string`, i),
 			fmt.Sprintf(`level=WARN msg="some warn message %d"`, i),

testdata/log-frankenphp_log.php

@@ -2,6 +2,8 @@
 
 require_once __DIR__.'/_executor.php';
 
+frankenphp_log("default level message");
+
 return function () {
 	frankenphp_log("some debug message {$_GET['i']}", FRANKENPHP_LOG_LEVEL_DEBUG, [
 		"key int"    => 1,