From db5cefad6058a1798086fa06d753a0040ff99d57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20L=C3=BCck?= <christian@clue.engineering>
Date: Sun, 27 Oct 2024 10:57:08 +0100
Subject: [PATCH] Update documentation and container images to PHP 8.4

---
 .github/workflows/ci.yml                |  4 ++--
 docs/best-practices/deployment.md       | 10 +++++-----
 tests/integration/Dockerfile-basics     |  2 +-
 tests/integration/Dockerfile-production |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 797a791..7541cfc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -103,7 +103,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.3
+          php-version: 8.4
       - run: composer install -d tests/integration/
       - run: docker build -f tests/integration/${{ matrix.dockerfile }} tests/integration/
       - run: docker run -d -p 8080:8080 -v "$PWD/composer.json":/app/composer.json $(docker images -q | head -n1)
@@ -127,7 +127,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.3
+          php-version: 8.4
       - run: composer install -d tests/integration/
       - run: docker build -f tests/integration/Dockerfile-basics tests/integration/
       - run: docker run -d -p 8080:8080 -v "$PWD/composer.json":/app/composer.json $(docker images -q | head -n1)
diff --git a/docs/best-practices/deployment.md b/docs/best-practices/deployment.md
index 62ca3a1..5dc2680 100644
--- a/docs/best-practices/deployment.md
+++ b/docs/best-practices/deployment.md
@@ -229,7 +229,7 @@ If you're not already running an Apache server, you can run your X project with
 Apache in a temporary Docker container like this:
 
 ```bash
-$ docker run -it --rm -p 80:80 -v "$PWD":/srv php:8.3-apache sh -c "rmdir /var/www/html;ln -s /srv/public /var/www/html;ln -s /etc/apache2/mods-available/rewrite.load /etc/apache2/mods-enabled; apache2-foreground"
+$ docker run -it --rm -p 80:80 -v "$PWD":/srv php:8.4-apache sh -c "rmdir /var/www/html;ln -s /srv/public /var/www/html;ln -s /etc/apache2/mods-available/rewrite.load /etc/apache2/mods-enabled; apache2-foreground"
 ```
 
 In order to check your web application responds as expected, you can use your
@@ -313,10 +313,10 @@ limit to match your concurrency workload. On Ubuntu- or Debian-based systems,
 you may change your PHP configuration like this:
 
 ```bash
-$ sudoedit /etc/php/8.3/cli/php.ini
+$ sudoedit /etc/php/8.4/cli/php.ini
 ```
 
-```diff title="/etc/php/8.3/cli/php.ini"
+```diff title="/etc/php/8.4/cli/php.ini"
 - memory_limit = 128M
 + memory_limit = -1
 ```
@@ -552,7 +552,7 @@ be achieved by using a `Dockerfile` with the following contents:
 
     ```docker title="Dockerfile"
     # syntax=docker/dockerfile:1
-    FROM php:8.3-cli
+    FROM php:8.4-cli
 
     WORKDIR /app/
     COPY public/ public/
@@ -574,7 +574,7 @@ be achieved by using a `Dockerfile` with the following contents:
     COPY composer.json composer.lock ./
     RUN composer install --no-dev --ignore-platform-reqs --optimize-autoloader
 
-    FROM php:8.3-alpine
+    FROM php:8.4-alpine
 
     # recommended: install optional extensions ext-ev and ext-sockets
     RUN apk --no-cache add ${PHPIZE_DEPS} libev linux-headers \ 
diff --git a/tests/integration/Dockerfile-basics b/tests/integration/Dockerfile-basics
index 270aa38..b54d9cf 100644
--- a/tests/integration/Dockerfile-basics
+++ b/tests/integration/Dockerfile-basics
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM php:8.3-cli
+FROM php:8.4-cli
 
 WORKDIR /app/
 COPY public/ public/
diff --git a/tests/integration/Dockerfile-production b/tests/integration/Dockerfile-production
index ccf3b48..71211d0 100644
--- a/tests/integration/Dockerfile-production
+++ b/tests/integration/Dockerfile-production
@@ -8,7 +8,7 @@ COPY composer.json composer.lock ./
 # dev environment already has dependencies installed:
 COPY vendor/ vendor/
 
-FROM php:8.3-alpine
+FROM php:8.4-alpine
 
 # recommended: install optional extensions ext-ev and ext-sockets
 RUN apk --no-cache add ${PHPIZE_DEPS} libev linux-headers \