From e371687980cf5493bb968f26da68197a2849a16c Mon Sep 17 00:00:00 2001
From: camer0n <e107inc@gmail.com>
Date: Mon, 17 Mar 2025 14:23:15 -0700
Subject: [PATCH] Issue #5443 Use PHP 8.1

---
 .github/workflows/test-acceptance.yml | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/test-acceptance.yml b/.github/workflows/test-acceptance.yml
index a4a4f840b..8e4e3afe5 100644
--- a/.github/workflows/test-acceptance.yml
+++ b/.github/workflows/test-acceptance.yml
@@ -9,12 +9,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php_version:
-          - "8.0"  # Test with PHP 8.0
-          # Uncomment the line below to also test with PHP 8.4
-          # - "8.4"
         operating_system:
-          - image: docker.io/jrei/systemd-ubuntu:20.04  # Base image with PHP 8.0
+          - image: docker.io/jrei/systemd-ubuntu:22.04  # Uses PHP 8.1 by default
     runs-on: ubuntu-latest
 
     steps:
@@ -51,22 +47,15 @@ jobs:
           "
         working-directory: ./e107_tests/lib/ci/salt/
 
-      - name: Install PHP and extensions
+      - name: Install PHP extensions
         run: |
           docker exec target apt-get update
-          docker exec target apt-get install -y software-properties-common
-          # Add ondrej/php PPA for PHP 8.4 support (optional)
-          docker exec target add-apt-repository ppa:ondrej/php -y
-          docker exec target apt-get update
-          # Install PHP and required extensions
-          docker exec target apt-get install -y php${{ matrix.php_version }} php${{ matrix.php_version }}-zip php${{ matrix.php_version }}-curl php${{ matrix.php_version }}-mbstring php${{ matrix.php_version }}-xml
-          # Set the specified PHP version as the default
-          docker exec target update-alternatives --set php /usr/bin/php${{ matrix.php_version }}
-        # Note: For PHP 8.0 on Ubuntu 20.04, this step will essentially ensure the default version is used and extensions are installed.
+          docker exec target apt-get install -y php8.1-zip php8.1-curl php8.1-mbstring php8.1-xml
+        # Install extensions for PHP 8.1 (default in Ubuntu 22.04)
 
       - name: Verify PHP version
         run: docker exec target php -v
-        # This step helps confirm the PHP version in use.
+        # Confirms PHP 8.1 is in use
 
       - name: Install test dependencies
         run: |