From f87f353cf9ba884954d800db9dd0ae82c06f3bfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20=C5=A0tancl?= <samuel@archte.ch>
Date: Mon, 1 Sep 2025 21:09:47 +0200
Subject: [PATCH] docker-compose: Properly pass through PHP_VERSION

Also revert composer.json docker-rebuild script to PHP 8.4, as
PHP 8.5 beta doesn't currently support phpredis, rendering the
Dockerfile unbuildable.
---
 composer.json      | 2 +-
 docker-compose.yml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index e5b86b07..2eab8837 100644
--- a/composer.json
+++ b/composer.json
@@ -65,7 +65,7 @@
         "docker-restart": "docker compose down && docker compose up -d",
         "docker-rebuild": [
             "Composer\\Config::disableProcessTimeout",
-            "PHP_VERSION=8.5.0beta3 docker compose up -d --no-deps --build"
+            "PHP_VERSION=8.4 docker compose up -d --no-deps --build"
         ],
         "docker-rebuild-with-xdebug": [
             "Composer\\Config::disableProcessTimeout",
diff --git a/docker-compose.yml b/docker-compose.yml
index 34bd1cc1..70a68019 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,6 +3,7 @@ services:
         build:
             context: .
             args:
+                PHP_VERSION: ${PHP_VERSION:-8.4}
                 XDEBUG_ENABLED: ${XDEBUG_ENABLED:-false}
         depends_on:
             mysql: