From 8d9c3c1c54df4ba1efd584f0452a6b3fdcea11be Mon Sep 17 00:00:00 2001
From: Timo Tijhof <krinkle@fastmail.com>
Date: Mon, 6 Jan 2025 18:42:59 +0000
Subject: [PATCH] Install PHP from PPA

Change-Id: I363ef7bfbd49fcf6021a5dced338bb2bbd226928
---
 .github/workflows/php.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 4840d7ed..202b8c30 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -27,7 +27,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          # Includes php7.4 - 8.3 and composer 2
+          # Includes 8.3 and composer 2
           # https://github.com/actions/runner-images/blob/releases/ubuntu20/20241023/images/ubuntu/Ubuntu2004-Readme.md#php-tools
           - php: '7.4'
             os: ubuntu-20.04
@@ -39,6 +39,8 @@ jobs:
             os: ubuntu-20.04
           - php: '8.3'
             os: ubuntu-20.04
+          - php: '8.4'
+            os: ubuntu-20.04
 
     runs-on: ${{ matrix.os }}
 
@@ -47,7 +49,11 @@ jobs:
       uses: actions/checkout@v2
 
     - name: Use PHP ${{ matrix.php }}
-      run: sudo update-alternatives --set php /usr/bin/php${{ matrix.php }}
+      run: |
+        sudo apt-add-repository ppa:ondrej/php -y
+        sudo apt-get update
+        sudo apt-get install -y php${{ matrix.php }} php${{ matrix.php }}-intl php${{ matrix.php }}-mbstring php${{ matrix.php }}-xml php${{ matrix.php }}-apcu php${{ matrix.php }}-curl
+        php --version
 
     - name: Validate composer.json and composer.lock
       run: composer validate