From 598bbe5e21c3b0cb8926e3642a38c717d66c2347 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Anne?= <cedric.anne@gmail.com>
Date: Mon, 21 Jul 2025 11:34:04 +0200
Subject: [PATCH] Add PHP 8.5 dev env

---
 .github/workflows/glpi-development-env.yml |  3 ++-
 glpi-development-env/Dockerfile            | 13 ++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/glpi-development-env.yml b/.github/workflows/glpi-development-env.yml
index 6a90d9d..db95030 100644
--- a/.github/workflows/glpi-development-env.yml
+++ b/.github/workflows/glpi-development-env.yml
@@ -28,7 +28,8 @@ jobs:
           - {base-image: "php:8.1-apache-trixie", php-version: "8.1", latest: "false"}
           - {base-image: "php:8.2-apache-trixie", php-version: "8.2", latest: "false"}
           - {base-image: "php:8.3-apache-trixie", php-version: "8.3", latest: "false"}
-          - {base-image: "php:8.4-apache-trixie", php-version: "8.4", latest: "true"}
+          - {base-image: "php:8.4-apache-trixie", php-version: "8.4", latest: "false"}
+          - {base-image: "php:8.5-apache-trixie", php-version: "8.5", latest: "true"}
     steps:
       - name: "Set variables"
         run: |
diff --git a/glpi-development-env/Dockerfile b/glpi-development-env/Dockerfile
index 70bec2d..90ca360 100644
--- a/glpi-development-env/Dockerfile
+++ b/glpi-development-env/Dockerfile
@@ -19,6 +19,7 @@ LABEL \
 
 RUN apt update \
   && PHP_MAJOR_VERSION="$(echo $PHP_VERSION | cut -d '.' -f 1)" \
+  && PHP_MINOR_VERSION="$(echo $PHP_VERSION | cut -d '.' -f 2)" \
   \
   # Install bz2 extension (for marketplace).
   && apt install --assume-yes --no-install-recommends --quiet libbz2-dev \
@@ -52,8 +53,10 @@ RUN apt update \
   # Install bcmath PHP extension.
   && docker-php-ext-install bcmath \
   \
-  # Install opcache PHP extension.
-  && docker-php-ext-install opcache \
+  # Install opcache PHP extension (it is already enabled in PHP 8.5+ images).
+  && if [ $PHP_MINOR_VERSION -ne "8.5" ]; then \
+    docker-php-ext-install opcache \
+  ; fi \
   \
   # Install pcntl PHP extension (required for composer-require-checker).
   && docker-php-ext-install pcntl \
@@ -70,7 +73,11 @@ RUN apt update \
   && if [ $PHP_MAJOR_VERSION -lt "8" ]; then \
     pecl install xdebug-3.1.6 \
   ; else \
-    pecl install xdebug \
+    # xdebug 3.5.0 is not available on PECL, its distribution is now made through PIE
+    mkdir -p /tmp/xdebug \
+    && (curl --fail --silent --show-error --location https://github.com/xdebug/xdebug/archive/refs/tags/3.5.0.tar.gz | tar --extract --ungzip --verbose --directory="/tmp/xdebug" --strip 1) \
+    && docker-php-ext-install /tmp/xdebug \
+    && rm -rf /tmp/xdebug \
   ; fi \
   && docker-php-ext-enable xdebug \
   \