Skip to content

feat: use frankenphp.dev as Go module path #1630

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
dunglas wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

feat: use frankenphp.dev as Go module path #1630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
afc4463
feat: use frankenphp.dev as Go module path
dunglas Jun 5, 2025
79e3a98
fix
dunglas Jun 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
.idea/
.vscode/
__debug_bin
frankenphp.test
frankenphp.dev.test
caddy/frankenphp/Build
*.log
2 changes: 1 addition & 1 deletion .github/workflows/sanitizers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,4 +101,4 @@ jobs:
- name: Compile tests
run: go test ${{ matrix.sanitizer == 'msan' && '-tags=nowatcher' || '' }} -${{ matrix.sanitizer }} -v -x -c
- name: Run tests
run: ./frankenphp.test -test.v
run: ./frankenphp.dev.test -test.v
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
.idea/
.vscode/
__debug_bin
frankenphp.test
frankenphp.dev.test
caddy/frankenphp/Build
package/etc/php.ini
*.log
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ docker buildx bake -f docker-bake.hcl --pull --no-cache --push

```console
go test -tags watcher -c -ldflags=-w
gdb --args frankenphp.test -test.run ^MyTest$
gdb --args frankenphp.dev.test -test.run ^MyTest$
```

9. When the bug is fixed, revert all these changes
Expand Down Expand Up @@ -214,6 +214,6 @@ follow these steps:
3. Copy the `README.md` and `CONTRIBUTING.md` files from the root directory to the new directory
4. Translate the content of the files, but don't change the filenames, also don't translate strings starting with `> [!` (it's special markup for GitHub)
5. Create a Pull Request with the translations
6. In the [site repository](https://github.com/dunglas/frankenphp-website/tree/main), copy and translate the translation files in the `content/`, `data/` and `i18n/` directories
6. In the [site repository](https://github.com/dunglas/frankenphp-website), copy and translate the translation files in the `content/`, `data/` and `i18n/` directories
7. Translate the values in the created YAML file
8. Open a Pull Request on the site repository
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ frankenphp php-server
- [Laravel integration](https://frankenphp.dev/docs/laravel/)
- [Known issues](https://frankenphp.dev/docs/known-issues/)
- [Demo app (Symfony) and benchmarks](https://github.com/dunglas/frankenphp-demo)
- [Go library documentation](https://pkg.go.dev/github.com/dunglas/frankenphp)
- [Go library documentation](https://pkg.go.dev/frankenphp.dev)
- [Contributing and debugging](https://frankenphp.dev/docs/contributing/)

## Examples and Skeletons
Expand Down
4 changes: 2 additions & 2 deletions build-static.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,8 +330,8 @@ CGO_ENABLED=1 \
${XCADDY_COMMAND} build \
--output "../dist/${bin}" \
${XCADDY_ARGS} \
--with github.com/dunglas/frankenphp=.. \
--with github.com/dunglas/frankenphp/caddy=.
--with frankenphp.dev=.. \
--with frankenphp.dev/caddy=.
Comment on lines +333 to +334
Copy link
Contributor

@henderkes henderkes Jun 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This strikes me as very strange, couldn't it point to github.com/php/frankenphp instead?

XCADDY_ARGS="
    --with github.com/baldinof/caddy-supervisor
    --with github.com/caddyserver/cache-handler
    --with github.com/dunglas/caddy-cbrotli
    --with github.com/dunglas/mercure/caddy
    --with github.com/dunglas/vulcain/caddy
    --with frankenphp.dev
    --with frankenphp.dev/caddy"
    ```

Copy link
Member Author

@dunglas dunglas Jun 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It could, but if PHP move from GitHub to another hosting platform at some point (ex: GitLab), it will break everything. Here we'll be able to switch to another Got host without breaking the imports.

cd ..

if [ -d "${EMBED}" ]; then
Expand Down
2 changes: 1 addition & 1 deletion caddy/admin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"encoding/json"
"fmt"
"github.com/caddyserver/caddy/v2"
"github.com/dunglas/frankenphp"
"frankenphp.dev"
"net/http"
)

Expand Down
4 changes: 2 additions & 2 deletions caddy/admin_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ import (
"bytes"
"encoding/json"
"fmt"
"github.com/dunglas/frankenphp/internal/fastabs"
"io"
"net/http"
"sync"
"testing"

"frankenphp.dev"
"frankenphp.dev/internal/fastabs"
"github.com/caddyserver/caddy/v2/caddytest"
"github.com/dunglas/frankenphp"
"github.com/stretchr/testify/assert"
)

Expand Down
4 changes: 2 additions & 2 deletions caddy/caddy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"strings"
"time"

"github.com/dunglas/frankenphp/internal/fastabs"
"frankenphp.dev/internal/fastabs"

"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/caddyconfig"
Expand All @@ -23,7 +23,7 @@ import (
"github.com/caddyserver/caddy/v2/modules/caddyhttp"
"github.com/caddyserver/caddy/v2/modules/caddyhttp/fileserver"
"github.com/caddyserver/caddy/v2/modules/caddyhttp/rewrite"
"github.com/dunglas/frankenphp"
"frankenphp.dev"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions caddy/caddy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (

"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/caddytest"
"github.com/dunglas/frankenphp"
"github.com/dunglas/frankenphp/internal/fastabs"
"frankenphp.dev"
"frankenphp.dev/internal/fastabs"
"github.com/prometheus/client_golang/prometheus/testutil"
"github.com/stretchr/testify/require"
)
Expand Down
2 changes: 1 addition & 1 deletion caddy/frankenphp/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
// plug in Caddy modules here.
_ "github.com/caddyserver/caddy/v2/modules/standard"
_ "github.com/dunglas/caddy-cbrotli"
_ "github.com/dunglas/frankenphp/caddy"
_ "frankenphp.dev/caddy"
_ "github.com/dunglas/mercure/caddy"
_ "github.com/dunglas/vulcain/caddy"
)
Expand Down
6 changes: 3 additions & 3 deletions caddy/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
module github.com/dunglas/frankenphp/caddy
module frankenphp.dev/caddy

go 1.24.0

replace github.com/dunglas/frankenphp => ../
replace frankenphp.dev => ../

retract v1.0.0-rc.1 // Human error

require (
github.com/caddyserver/caddy/v2 v2.10.0
github.com/caddyserver/certmagic v0.23.0
github.com/dunglas/caddy-cbrotli v1.0.0
github.com/dunglas/frankenphp v1.7.0
frankenphp.dev v1.7.0
github.com/dunglas/mercure/caddy v0.19.2
github.com/dunglas/vulcain/caddy v1.2.0
github.com/prometheus/client_golang v1.22.0
Expand Down
1 change: 1 addition & 0 deletions caddy/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ github.com/dolthub/maphash v0.1.0 h1:bsQ7JsF4FkkWyrP3oCnFJgrCUAFbFf3kOl4L/QxPDyQ
github.com/dolthub/maphash v0.1.0/go.mod h1:gkg4Ch4CdCDu5h6PMriVLawB7koZ+5ijb9puGMV50a4=
github.com/dunglas/caddy-cbrotli v1.0.0 h1:+WNqXBkWyMcIpXB2rVZ3nwcElUbuAzf0kPxNXU4D+u0=
github.com/dunglas/caddy-cbrotli v1.0.0/go.mod h1:KZsUu3fnQBgO0o3YDoQuO3Z61dFgUncr1F8rg8acwQw=
github.com/dunglas/frankenphp v1.7.0/go.mod h1:BaPr7WO5PmAkMtJvRUhRcmdWNAuEIK1zWLC++c8GhE0=
github.com/dunglas/httpsfv v1.1.0 h1:Jw76nAyKWKZKFrpMMcL76y35tOpYHqQPzHQiwDvpe54=
github.com/dunglas/httpsfv v1.1.0/go.mod h1:zID2mqw9mFsnt7YC3vYQ9/cjq30q41W+1AnDwH8TiMg=
github.com/dunglas/mercure v0.19.2 h1:eBMQhxvzJTenIffL+jlqtWO+TPevCjOQ+DQJb8iB6+s=
Expand Down
2 changes: 1 addition & 1 deletion caddy/php-cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"path/filepath"

caddycmd "github.com/caddyserver/caddy/v2/cmd"
"github.com/dunglas/frankenphp"
"frankenphp.dev"

"github.com/spf13/cobra"
)
Expand Down
3 changes: 1 addition & 2 deletions caddy/php-server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ import (
"github.com/caddyserver/caddy/v2/modules/caddyhttp/fileserver"
"github.com/caddyserver/caddy/v2/modules/caddyhttp/rewrite"
"github.com/caddyserver/certmagic"
"github.com/dunglas/frankenphp"

"frankenphp.dev"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cgi.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"strings"
"unsafe"

"github.com/dunglas/frankenphp/internal/phpheaders"
"frankenphp.dev/internal/phpheaders"
)

var knownServerKeys = []string{
Expand Down
2 changes: 1 addition & 1 deletion docs/cn/CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ docker buildx bake -f docker-bake.hcl --pull --no-cache --push

```console
go test -tags watcher -c -ldflags=-w
gdb --args frankenphp.test -test.run ^MyTest$
gdb --args frankenphp.dev.test -test.run ^MyTest$
```

9. 当错误修复后，恢复所有这些更改
Expand Down
2 changes: 1 addition & 1 deletion docs/cn/compile.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ CGO_ENABLED=1 \
XCADDY_GO_BUILD_FLAGS="-ldflags '-w -s'" \
xcaddy build \
--output frankenphp \
--with github.com/dunglas/frankenphp/caddy \
--with frankenphp.dev/caddy \
--with github.com/dunglas/caddy-cbrotli \
--with github.com/dunglas/mercure/caddy \
--with github.com/dunglas/vulcain/caddy
Expand Down
4 changes: 2 additions & 2 deletions docs/cn/docker.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ RUN CGO_ENABLED=1 \
CGO_LDFLAGS="$(php-config --ldflags) $(php-config --libs)" \
xcaddy build \
--output /usr/local/bin/frankenphp \
--with github.com/dunglas/frankenphp=./ \
--with github.com/dunglas/frankenphp/caddy=./caddy/ \
--with frankenphp.dev=./ \
--with frankenphp.dev/caddy=./caddy/ \
--with github.com/dunglas/caddy-cbrotli \
# Mercure 和 Vulcain 包含在官方版本中，如果不需要你可以删除它们
--with github.com/dunglas/mercure/caddy \
Expand Down
2 changes: 1 addition & 1 deletion docs/compile.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ CGO_CFLAGS=$(php-config --includes) \
CGO_LDFLAGS="$(php-config --ldflags) $(php-config --libs)" \
xcaddy build \
--output frankenphp \
--with github.com/dunglas/frankenphp/caddy \
--with frankenphp.dev/caddy \
--with github.com/dunglas/mercure/caddy \
--with github.com/dunglas/vulcain/caddy
# Add extra Caddy modules and FrankenPHP extensions here
Expand Down
4 changes: 2 additions & 2 deletions docs/docker.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ RUN CGO_ENABLED=1 \
CGO_LDFLAGS="$(php-config --ldflags) $(php-config --libs)" \
xcaddy build \
--output /usr/local/bin/frankenphp \
--with github.com/dunglas/frankenphp=./ \
--with github.com/dunglas/frankenphp/caddy=./caddy/ \
--with frankenphp.dev=./ \
--with frankenphp.dev/caddy=./caddy/ \
--with github.com/dunglas/caddy-cbrotli \
# Mercure and Vulcain are included in the official build, but feel free to remove them
--with github.com/dunglas/mercure/caddy \
Expand Down
2 changes: 1 addition & 1 deletion docs/fr/CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ docker buildx bake -f docker-bake.hcl --pull --no-cache --push

```console
go test -tags watcher -c -ldflags=-w
gdb --args frankenphp.test -test.run ^MyTest$
gdb --args frankenphp.dev.test -test.run ^MyTest$
```

9. Quand le bug est corrigé, annulez tous les changements.
Expand Down
2 changes: 1 addition & 1 deletion docs/fr/compile.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ CGO_CFLAGS=$(php-config --includes) \
CGO_LDFLAGS="$(php-config --ldflags) $(php-config --libs)" \
xcaddy build \
--output frankenphp \
--with github.com/dunglas/frankenphp/caddy \
--with frankenphp.dev/caddy \
--with github.com/dunglas/caddy-cbrotli \
--with github.com/dunglas/mercure/caddy \
--with github.com/dunglas/vulcain/caddy
Expand Down
4 changes: 2 additions & 2 deletions docs/fr/docker.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ RUN CGO_ENABLED=1 \
CGO_LDFLAGS="$(php-config --ldflags) $(php-config --libs)" \
xcaddy build \
--output /usr/local/bin/frankenphp \
--with github.com/dunglas/frankenphp=./ \
--with github.com/dunglas/frankenphp/caddy=./caddy/ \
--with frankenphp.dev=./ \
--with frankenphp.dev/caddy=./caddy/ \
--with github.com/dunglas/caddy-cbrotli \
# Mercure et Vulcain sont inclus dans la construction officielle, mais n'hésitez pas à les retirer
--with github.com/dunglas/mercure/caddy \
Expand Down
2 changes: 1 addition & 1 deletion docs/ru/CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ docker buildx bake -f docker-bake.hcl --pull --no-cache --push

```console
go test -tags watcher -c -ldflags=-w
gdb --args frankenphp.test -test.run ^MyTest$
gdb --args frankenphp.dev.test -test.run ^MyTest$
```

9. После исправления ошибки откатите все внесенные изменения.
Expand Down
2 changes: 1 addition & 1 deletion docs/ru/compile.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ CGO_CFLAGS=$(php-config --includes) \
CGO_LDFLAGS="$(php-config --ldflags) $(php-config --libs)" \
xcaddy build \
--output frankenphp \
--with github.com/dunglas/frankenphp/caddy \
--with frankenphp.dev/caddy \
--with github.com/dunglas/mercure/caddy \
--with github.com/dunglas/vulcain/caddy
# Добавьте дополнительные модули Caddy здесь
Expand Down
4 changes: 2 additions & 2 deletions docs/ru/docker.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ RUN CGO_ENABLED=1 \
CGO_LDFLAGS="$(php-config --ldflags) $(php-config --libs)" \
xcaddy build \
--output /usr/local/bin/frankenphp \
--with github.com/dunglas/frankenphp=./ \
--with github.com/dunglas/frankenphp/caddy=./caddy/ \
--with frankenphp.dev=./ \
--with frankenphp.dev/caddy=./caddy/ \
--with github.com/dunglas/caddy-cbrotli \
# Mercure и Vulcain включены в официальный билд, но вы можете их удалить
--with github.com/dunglas/mercure/caddy \
Expand Down
2 changes: 1 addition & 1 deletion docs/tr/CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ docker buildx bake -f docker-bake.hcl --pull --no-cache --push

```console
go test -tags watcher -c -ldflags=-w
gdb --args frankenphp.test -test.run ^MyTest$
gdb --args frankenphp.dev.test -test.run ^MyTest$
```

9. Hata düzeltildiğinde, tüm bu değişiklikleri geri alın
Expand Down
2 changes: 1 addition & 1 deletion docs/tr/compile.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ CGO_ENABLED=1 \
XCADDY_GO_BUILD_FLAGS="-ldflags '-w -s'" \
xcaddy build \
--output frankenphp \
--with github.com/dunglas/frankenphp/caddy \
--with frankenphp.dev/caddy \
--with github.com/dunglas/caddy-cbrotli \
--with github.com/dunglas/mercure/caddy \
--with github.com/dunglas/vulcain/caddy
Expand Down
4 changes: 2 additions & 2 deletions docs/tr/docker.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ RUN CGO_ENABLED=1 \
CGO_LDFLAGS="$(php-config --ldflags) $(php-config --libs)" \
xcaddy build \
--output /usr/local/bin/frankenphp \
--with github.com/dunglas/frankenphp=./ \
--with github.com/dunglas/frankenphp/caddy=./caddy/ \
--with frankenphp.dev=./ \
--with frankenphp.dev/caddy=./caddy/ \
--with github.com/dunglas/caddy-cbrotli \
# Mercure ve Vulcain resmi yapıya dahil edilmiştir, ancak bunları kaldırmaktan çekinmeyin
--with github.com/dunglas/mercure/caddy \
Expand Down
4 changes: 2 additions & 2 deletions frankenphp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import (
"sync"
"testing"

"github.com/dunglas/frankenphp"
"github.com/dunglas/frankenphp/internal/fastabs"
"frankenphp.dev"
"frankenphp.dev/internal/fastabs"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.uber.org/zap/exp/zapslog"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/dunglas/frankenphp
module frankenphp.dev

go 1.24.0

Expand Down
2 changes: 1 addition & 1 deletion internal/testcli/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"log"
"os"

"github.com/dunglas/frankenphp"
"frankenphp.dev"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion internal/testserver/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"net/http"
"os"

"github.com/dunglas/frankenphp"
"frankenphp.dev"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion internal/watcher/watch_pattern.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"path/filepath"
"strings"

"github.com/dunglas/frankenphp/internal/fastabs"
"frankenphp.dev/internal/fastabs"
)

type watchPattern struct {
Expand Down
4 changes: 2 additions & 2 deletions phpmainthread.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"strings"
"sync"

"github.com/dunglas/frankenphp/internal/memory"
"github.com/dunglas/frankenphp/internal/phpheaders"
"frankenphp.dev/internal/memory"
"frankenphp.dev/internal/phpheaders"
)

// represents the main PHP thread
Expand Down
2 changes: 1 addition & 1 deletion phpmainthread_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"testing"
"time"

"github.com/dunglas/frankenphp/internal/phpheaders"
"frankenphp.dev/internal/phpheaders"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion request_options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"sync"
"sync/atomic"

"github.com/dunglas/frankenphp/internal/fastabs"
"frankenphp.dev/internal/fastabs"
)

// RequestOption instances allow to configure a FrankenPHP Request.
Expand Down
2 changes: 1 addition & 1 deletion scaling.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"sync"
"time"

"github.com/dunglas/frankenphp/internal/cpu"
"frankenphp.dev/internal/cpu"
)

const (
Expand Down
Loading