Merge branch 'main' into fix/always-ignore-user-abort

Author: henderkes

build-static.sh

@@ -147,6 +147,13 @@ else
 	spcCommand="./bin/spc"
 fi
 
+# turn potentially relative EMBED path into absolute path
+if [ -n "${EMBED}" ]; then
+	if [[ "${EMBED}" != /* ]]; then
+		EMBED="${CURRENT_DIR}/${EMBED}"
+	fi
+fi
+
 # Extensions to build
 if [ -z "${PHP_EXTENSIONS}" ]; then
 	# enable EMBED mode, first check if project has dumped extensions
@@ -178,9 +185,6 @@ fi
 
 # Embed PHP app, if any
 if [ -n "${EMBED}" ] && [ -d "${EMBED}" ]; then
-	if [[ "${EMBED}" != /* ]]; then
-		EMBED="${CURRENT_DIR}/${EMBED}"
-	fi
 	# shellcheck disable=SC2089
 	SPC_OPT_BUILD_ARGS="${SPC_OPT_BUILD_ARGS} --with-frankenphp-app='${EMBED}'"
 fi

internal/extgen/paramparser.go

@@ -92,7 +92,7 @@ func (pp *ParameterParser) generateParamParsing(params []phpParameter, requiredC
 	}
 
 	var builder strings.Builder
-	builder.WriteString(fmt.Sprintf("    ZEND_PARSE_PARAMETERS_START(%d, %d)", requiredCount, len(params)))
+	_, _ = fmt.Fprintf(&builder, "    ZEND_PARSE_PARAMETERS_START(%d, %d)", requiredCount, len(params))
 
 	optionalStarted := false
 	for _, param := range params {

internal/extgen/phpfunc.go

@@ -16,7 +16,7 @@ func (pfg *PHPFuncGenerator) generate(fn phpFunction) string {
 	paramInfo := pfg.paramParser.analyzeParameters(fn.Params)
 
 	funcName := NamespacedName(pfg.namespace, fn.Name)
-	builder.WriteString(fmt.Sprintf("PHP_FUNCTION(%s)\n{\n", funcName))
+	_, _ = fmt.Fprintf(&builder, "PHP_FUNCTION(%s)\n{\n", funcName)
 
 	if decl := pfg.paramParser.generateParamDeclarations(fn.Params); decl != "" {
 		builder.WriteString(decl + "\n")