ci: PHP 8.5 (#2006)

0x346e3730 · henderkes · dunglas · web-flow · commit 01beb66573f9 · 2025-11-21T13:54:07.000+01:00
Co-authored-by: Marc &lt;m@pyc.ac&gt;
Co-authored-by: Kévin Dunglas &lt;kevin@dunglas.fr&gt;
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -59,7 +59,7 @@ jobs:
           PHP_82_LATEST=$(skopeo inspect docker://docker.io/library/php:8.2 --override-os linux --override-arch amd64 | jq -r '.Env[] | select(test("^PHP_VERSION=")) | sub("^PHP_VERSION="; "")')
           PHP_83_LATEST=$(skopeo inspect docker://docker.io/library/php:8.3 --override-os linux --override-arch amd64 | jq -r '.Env[] | select(test("^PHP_VERSION=")) | sub("^PHP_VERSION="; "")')
           PHP_84_LATEST=$(skopeo inspect docker://docker.io/library/php:8.4 --override-os linux --override-arch amd64 | jq -r '.Env[] | select(test("^PHP_VERSION=")) | sub("^PHP_VERSION="; "")')
-          PHP_85_LATEST=$(skopeo inspect docker://docker.io/library/php:8.5-rc --override-os linux --override-arch amd64 | jq -r '.Env[] | select(test("^PHP_VERSION=")) | sub("^PHP_VERSION="; "")')
+          PHP_85_LATEST=$(skopeo inspect docker://docker.io/library/php:8.5 --override-os linux --override-arch amd64 | jq -r '.Env[] | select(test("^PHP_VERSION=")) | sub("^PHP_VERSION="; "")')
           {
             echo php_version="${PHP_82_LATEST},${PHP_83_LATEST},${PHP_84_LATEST},${PHP_85_LATEST}"
             echo php82_version="${PHP_82_LATEST//./-}"
diff --git a/.github/workflows/sanitizers.yaml b/.github/workflows/sanitizers.yaml
@@ -52,7 +52,7 @@ jobs:
       - name: Determine PHP version
         id: determine-php-version
         run: |
-          curl -fsSL 'https://www.php.net/releases/index.php?json&max=1&version=8.4' -o version.json
+          curl -fsSL 'https://www.php.net/releases/index.php?json&max=1&version=8.5' -o version.json
           echo version="$(jq -r 'keys[0]' version.json)" >> "$GITHUB_OUTPUT"
           echo archive="$(jq -r '.[] .source[] | select(.filename |endswith(".xz")) | "https://www.php.net/distributions/" + .filename' version.json)" >> "$GITHUB_OUTPUT"
       - name: Cache PHP
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -23,7 +23,7 @@ jobs:
   tests-linux:
     name: Tests (Linux, PHP ${{ matrix.php-versions }})
     runs-on: ubuntu-latest
-    continue-on-error: ${{ matrix.experimental || false }}
+    continue-on-error: false
     strategy:
       fail-fast: false
       matrix:
@@ -32,7 +32,6 @@ jobs:
           - php-versions: "8.3"
           - php-versions: "8.4"
           - php-versions: "8.5"
-            experimental: true
     env:
       GOMAXPROCS: 10
       LIBRARY_PATH: ${{ github.workspace }}/watcher/target/lib
@@ -84,18 +83,18 @@ jobs:
         run: ./reload_test.sh
       - name: Lint Go code
         uses: golangci/golangci-lint-action@v9
-        if: matrix.php-versions == '8.4'
+        if: matrix.php-versions == '8.5'
         with:
           version: latest
       - name: Ensure go.mod is tidy
-        if: matrix.php-versions == '8.4'
+        if: matrix.php-versions == '8.5'
         run: go mod tidy -diff
       - name: Ensure caddy/go.mod is tidy
-        if: matrix.php-versions == '8.4'
+        if: matrix.php-versions == '8.5'
         run: go mod tidy -diff
         working-directory: caddy/
   tests-mac:
-    name: Tests (macOS, PHP 8.4)
+    name: Tests (macOS, PHP 8.5)
     runs-on: macos-latest
     env:
       HOMEBREW_NO_AUTO_UPDATE: 1
@@ -111,7 +110,7 @@ jobs:
             caddy/go.sum
       - uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.4
+          php-version: 8.5
           ini-file: development
           coverage: none
           tools: none
diff --git a/Dockerfile b/Dockerfile
@@ -110,7 +110,7 @@ RUN go mod download
 WORKDIR /go/src/app
 COPY --link . ./
 
-# See https://github.com/docker-library/php/blob/master/8.4/trixie/zts/Dockerfile#L57-L59 for PHP values
+# See https://github.com/docker-library/php/blob/master/8.5/trixie/zts/Dockerfile#L57-L59 for PHP values
 ENV CGO_CFLAGS="-DFRANKENPHP_VERSION=$FRANKENPHP_VERSION $PHP_CFLAGS"
 ENV CGO_CPPFLAGS=$PHP_CPPFLAGS
 ENV CGO_LDFLAGS="-L/usr/local/lib -lssl -lcrypto -lreadline -largon2 -lcurl -lonig -lz $PHP_LDFLAGS"
diff --git a/dev-alpine.Dockerfile b/dev-alpine.Dockerfile
@@ -48,7 +48,7 @@ RUN apk add --no-cache \
 	echo 'set auto-load safe-path /' > /root/.gdbinit
 
 WORKDIR /usr/local/src/php
-RUN git clone --branch=PHP-8.4 https://github.com/php/php-src.git . && \
+RUN git clone --branch=PHP-8.5 https://github.com/php/php-src.git . && \
 	# --enable-embed is necessary to generate libphp.so, but we don't use this SAPI directly
 	./buildconf --force && \
 	EXTENSION_DIR=/usr/lib/frankenphp/modules ./configure \
diff --git a/dev.Dockerfile b/dev.Dockerfile
@@ -50,7 +50,7 @@ RUN apt-get update && \
 	apt-get clean
 
 WORKDIR /usr/local/src/php
-RUN git clone --branch=PHP-8.4 https://github.com/php/php-src.git . && \
+RUN git clone --branch=PHP-8.5 https://github.com/php/php-src.git . && \
 	# --enable-embed is only necessary to generate libphp.so, we don't use this SAPI directly
 	./buildconf --force && \
 	EXTENSION_DIR=/usr/lib/frankenphp/modules ./configure \
diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -7,7 +7,7 @@ variable "VERSION" {
 }
 
 variable "PHP_VERSION" {
-    default = "8.2,8.3,8.4"
+    default = "8.2,8.3,8.4,8.5"
 }
 
 variable "GO_VERSION" {
@@ -30,7 +30,7 @@ variable "CI" {
 }
 
 variable DEFAULT_PHP_VERSION {
-    default = "8.4"
+    default = "8.5"
 }
 
 function "tag" {
diff --git a/docs/cn/docker.md b/docs/cn/docker.md
@@ -2,7 +2,7 @@
 
 [FrankenPHP Docker 镜像](https://hub.docker.com/r/dunglas/frankenphp) 基于 [官方 PHP 镜像](https://hub.docker.com/_/php/)。提供适用于流行架构的 Debian 和 Alpine Linux 变体。推荐使用 Debian 变体。
 
-提供 PHP 8.2、8.3 和 8.4 的变体。
+提供 PHP 8.2、8.3、8.4 和 8.5 的变体。
 
 标签遵循此模式：`dunglas/frankenphp:<frankenphp-version>-php<php-version>-<os>`
 
diff --git a/docs/docker.md b/docs/docker.md
@@ -4,7 +4,7 @@
 Debian and Alpine Linux variants are provided for popular architectures.
 Debian variants are recommended.
 
-Variants for PHP 8.2, 8.3 and 8.4 are provided.
+Variants for PHP 8.2, 8.3, 8.4 and 8.5 are provided.
 
 The tags follow this pattern: `dunglas/frankenphp:<frankenphp-version>-php<php-version>-<os>`
 
diff --git a/docs/fr/docker.md b/docs/fr/docker.md
@@ -2,7 +2,7 @@
 
 Les images Docker de [FrankenPHP](https://hub.docker.com/r/dunglas/frankenphp) sont basées sur les [images PHP officielles](https://hub.docker.com/_/php/). Des variantes Debian et Alpine Linux sont fournies pour les architectures populaires. Les variantes Debian sont recommandées.
 
-Des variantes pour PHP 8.2, 8.3 et 8.4 sont disponibles. [Parcourir les tags](https://hub.docker.com/r/dunglas/frankenphp/tags).
+Des variantes pour PHP 8.2, 8.3, 8.4 et 8.5 sont disponibles. [Parcourir les tags](https://hub.docker.com/r/dunglas/frankenphp/tags).
 
 Les tags suivent le pattern suivant: `dunglas/frankenphp:<frankenphp-version>-php<php-version>-<os>`
 
diff --git a/docs/ja/docker.md b/docs/ja/docker.md
@@ -2,7 +2,7 @@
 
 [FrankenPHPのDockerイメージ](https://hub.docker.com/r/dunglas/frankenphp)は、[公式PHPイメージ](https://hub.docker.com/_/php/)をベースにしています。主要なアーキテクチャに対してDebianとAlpine Linuxのバリアントを提供しており、Debianバリアントの使用を推奨しています。
 
-PHP 8.2、8.3、8.4向けのバリアントが提供されています。
+PHP 8.2、8.3、8.4、8.5向けのバリアントが提供されています。
 
 タグは次のパターンに従います：`dunglas/frankenphp:<frankenphp-version>-php<php-version>-<os>`
 
diff --git a/docs/pt-br/docker.md b/docs/pt-br/docker.md
@@ -6,7 +6,7 @@ Variantes do Debian e do Alpine Linux são fornecidas para arquiteturas
 populares.
 Variantes do Debian são recomendadas.
 
-Variantes para PHP 8.2, 8.3 e 8.4 são fornecidas.
+Variantes para PHP 8.2, 8.3, 8.4 e 8.5 são fornecidas.
 
 As tags seguem este padrão:
 `dunglas/frankenphp:<versao-do-frankenphp>-php<versao-do-php>-<so>`.
diff --git a/docs/ru/docker.md b/docs/ru/docker.md
@@ -2,7 +2,7 @@
 
 [Docker-образы FrankenPHP](https://hub.docker.com/r/dunglas/frankenphp) основаны на [официальных PHP-образах](https://hub.docker.com/_/php/). Доступны варианты для Debian и Alpine Linux для популярных архитектур. Рекомендуется использовать Debian-варианты.
 
-Доступны версии для PHP 8.2, 8.3 и 8.4.
+Доступны версии для PHP 8.2, 8.3, 8.4 и 8.5.
 
 Теги следуют следующему шаблону: `dunglas/frankenphp:<frankenphp-version>-php<php-version>-<os>`.
 
diff --git a/docs/tr/docker.md b/docs/tr/docker.md
@@ -2,7 +2,7 @@
 
 [Resmi PHP imajları](https://hub.docker.com/_/php/) temel alınarak [FrankenPHP Docker imajları](https://hub.docker.com/r/dunglas/frankenphp) hazırlanmıştır. Popüler mimariler için Debian ve Alpine Linux varyantları sağlanmıştır. Debian dağıtımı tavsiye edilir.
 
-PHP 8.2, 8.3 ve 8.4 için varyantlar sağlanmıştır. [Etiketlere göz atın](https://hub.docker.com/r/dunglas/frankenphp/tags).
+PHP 8.2, 8.3, 8.4 ve 8.5 için varyantlar sağlanmıştır. [Etiketlere göz atın](https://hub.docker.com/r/dunglas/frankenphp/tags).
 
 ## İmajlar Nasıl Kullanılır
 

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ jobs:`
`59`	`59`	`PHP_82_LATEST=$(skopeo inspect docker://docker.io/library/php:8.2 --override-os linux --override-arch amd64 \| jq -r '.Env[] \| select(test("^PHP_VERSION=")) \| sub("^PHP_VERSION="; "")')`
`60`	`60`	`PHP_83_LATEST=$(skopeo inspect docker://docker.io/library/php:8.3 --override-os linux --override-arch amd64 \| jq -r '.Env[] \| select(test("^PHP_VERSION=")) \| sub("^PHP_VERSION="; "")')`
`61`	`61`	`PHP_84_LATEST=$(skopeo inspect docker://docker.io/library/php:8.4 --override-os linux --override-arch amd64 \| jq -r '.Env[] \| select(test("^PHP_VERSION=")) \| sub("^PHP_VERSION="; "")')`
`62`		`- PHP_85_LATEST=$(skopeo inspect docker://docker.io/library/php:8.5-rc --override-os linux --override-arch amd64 \| jq -r '.Env[] \| select(test("^PHP_VERSION=")) \| sub("^PHP_VERSION="; "")')`
	`62`	`+ PHP_85_LATEST=$(skopeo inspect docker://docker.io/library/php:8.5 --override-os linux --override-arch amd64 \| jq -r '.Env[] \| select(test("^PHP_VERSION=")) \| sub("^PHP_VERSION="; "")')`
`63`	`63`	`{`
`64`	`64`	`echo php_version="${PHP_82_LATEST},${PHP_83_LATEST},${PHP_84_LATEST},${PHP_85_LATEST}"`
`65`	`65`	`echo php82_version="${PHP_82_LATEST//./-}"`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ variable "VERSION" {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`variable "PHP_VERSION" {`
`10`		`- default = "8.2,8.3,8.4"`
	`10`	`+ default = "8.2,8.3,8.4,8.5"`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`variable "GO_VERSION" {`
`@@ -30,7 +30,7 @@ variable "CI" {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`variable DEFAULT_PHP_VERSION {`
`33`		`- default = "8.4"`
	`33`	`+ default = "8.5"`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`function "tag" {`