From 8948eb5cc7ef0884610676b67f5a459c46b4bdda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Pineau?= <lyrixx@lyrixx.info>
Date: Wed, 15 Jun 2022 16:16:56 +0200
Subject: [PATCH] Tests with PHP 7.4, 8.0, and 8.1

---
 .github/workflows/ci.yml                          | 9 +++++++++
 CHANGELOG.md                                      | 1 +
 infrastructure/docker/services/builder/Dockerfile | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a292dbe..b2194b4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,6 +11,7 @@ name: CI
 
 jobs:
     check-python-cs:
+        name: Check Python CS
         runs-on: ubuntu-latest
         steps:
             -
@@ -24,6 +25,11 @@ jobs:
             -
                 run: 'pycodestyle --ignore=E501,W605,E722 invoke.py tasks.py'
     ci:
+        name: Test with PHP ${{ matrix.php-version }}
+        strategy:
+            fail-fast: false
+            matrix:
+                php-version: ['7.4', '8.0', '8.1']
         runs-on: ubuntu-latest
         steps:
             -
@@ -38,6 +44,9 @@ jobs:
             -
                 run: 'pip3 install pipenv'
 
+            -   name: Set PHP version
+                run: sed -i "s/^php_version = .*/php_version = '${{ matrix.php-version }}'/" invoke.py
+
             # Install the stack and run the tests
 
             -
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9cb95df..2747f3a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 * Add documentation cookbook for using pg_activity
 * Forward CI env vars in Docker containers
 * Run the npm/yarn/webpack commands on the host for all mac users (even the ones not using Dinghy)
+* Tests with PHP 7.4, 8.0, and 8.1
 
 ## 3.7.0 (2022-05-24)
 
diff --git a/infrastructure/docker/services/builder/Dockerfile b/infrastructure/docker/services/builder/Dockerfile
index ee38d14..2a7303e 100644
--- a/infrastructure/docker/services/builder/Dockerfile
+++ b/infrastructure/docker/services/builder/Dockerfile
@@ -29,7 +29,7 @@ RUN adduser app sudo \
     && phpenmod app-builder
 
 # Composer
-COPY --from=composer/composer:2.3.5 /usr/bin/composer /usr/bin/composer
+COPY --from=composer/composer:2.3.7 /usr/bin/composer /usr/bin/composer
 RUN mkdir -p "/home/app/.composer/cache" \
     && chown app: /home/app/.composer -R