use internal package

caddy/caddy.go

@@ -7,6 +7,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/dunglas/frankenphp/internal/fastabs"
 	"github.com/prometheus/client_golang/prometheus"
 	"net/http"
 	"path/filepath"
@@ -270,7 +271,7 @@ func (f *FrankenPHPModule) Provision(ctx caddy.Context) error {
 	}
 
 	if !needReplacement(f.Root) {
-		root, err := frankenphp.FastAbs(f.Root)
+		root, err := fastabs.FastAbs(f.Root)
 		if err != nil {
 			return fmt.Errorf("unable to make the root path absolute: %w", err)
 		}

cgi.go

@@ -279,7 +279,7 @@ func sanitizedPathJoin(root, reqPath string) string {
 
 	path := filepath.Join(root, filepath.Clean("/"+reqPath))
 
-	// filepath.Join also cleans the path, and cleaning strips
+	// fastabs.Join also cleans the path, and cleaning strips
 	// the trailing slash, so we need to re-add it afterward.
 	// if the length is 1, then it's a path to the root,
 	// and that should return ".", so we don't append the separator.

filepath_windows.go → internal/fastabs/filepath.go

@@ -1,4 +1,6 @@
-package frankenphp
+//go:build !unix
+
+package fastabs
 
 import (
 	"path/filepath"

filepath_unix.go → internal/fastabs/filepath_unix.go

@@ -1,4 +1,4 @@
-package frankenphp
+package fastabs
 
 import (
 	"os"
@@ -7,7 +7,7 @@ import (
 
 // FastAbs is an optimized version of filepath.Abs for Unix systems,
 // since we don't expect the working directory to ever change once
-// Caddy is running. Avoid the os.Getwd() syscall overhead.
+// Caddy is running. Avoid the os.Getwd syscall overhead.
 //
 // This function is INTERNAL and must not be used outside of this package.
 func FastAbs(path string) (string, error) {

internal/watcher/watch_pattern.go

@@ -3,7 +3,7 @@
 package watcher
 
 import (
-	"github.com/dunglas/frankenphp"
+	"github.com/dunglas/frankenphp/internal/fastabs"
 	"path/filepath"
 	"strings"
 
@@ -35,7 +35,7 @@ func parseFilePattern(filePattern string) (*watchPattern, error) {
 	w := &watchPattern{}
 
 	// first we clean the pattern
-	absPattern, err := frankenphp.FastAbs(filePattern)
+	absPattern, err := fastabs.FastAbs(filePattern)
 	if err != nil {
 		return nil, err
 	}

metrics.go

@@ -1,6 +1,7 @@
 package frankenphp
 
 import (
+	"github.com/dunglas/frankenphp/internal/fastabs"
 	"regexp"
 	"sync"
 	"time"
@@ -125,7 +126,7 @@ func (m *PrometheusMetrics) StopWorker(name string, reason StopReason) {
 }
 
 func (m *PrometheusMetrics) getIdentity(name string) (string, error) {
-	actualName, err := FastAbs(name)
+	actualName, err := fastabs.FastAbs(name)
 	if err != nil {
 		return name, err
 	}

request_options.go

@@ -1,6 +1,7 @@
 package frankenphp
 
 import (
+	"github.com/dunglas/frankenphp/internal/fastabs"
 	"path/filepath"
 
 	"go.uber.org/zap"
@@ -19,7 +20,7 @@ type RequestOption func(h *FrankenPHPContext) error
 func WithRequestDocumentRoot(documentRoot string, resolveSymlink bool) RequestOption {
 	return func(o *FrankenPHPContext) error {
 		// make sure file root is absolute
-		root, err := FastAbs(documentRoot)
+		root, err := fastabs.FastAbs(documentRoot)
 		if err != nil {
 			return err
 		}

worker.go

@@ -5,6 +5,7 @@ package frankenphp
 import "C"
 import (
 	"fmt"
+	"github.com/dunglas/frankenphp/internal/fastabs"
 	"net/http"
 	"path/filepath"
 	"sync"
@@ -63,7 +64,7 @@ func initWorkers(opt []workerOpt) error {
 }
 
 func newWorker(o workerOpt) (*worker, error) {
-	absFileName, err := FastAbs(o.fileName)
+	absFileName, err := fastabs.FastAbs(o.fileName)
 	if err != nil {
 		return nil, fmt.Errorf("worker filename is invalid %q: %w", o.fileName, err)
 	}