From c844d7de23e1f48f4be5f5ccbaa973da8d44d6d6 Mon Sep 17 00:00:00 2001
From: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
Date: Fri, 20 Dec 2024 10:52:00 +0100
Subject: [PATCH] Adds support for PHP 8.4 and improve phpunit.yml (#7912)

* Remove build2

* Remove include

* Rename operating-system to os

* Adds support for PHP 8.4

* Bump actions/checkout to v4

* Fix
---
 .github/workflows/phpunit.yml | 44 +++++++++--------------------------
 1 file changed, 11 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index 3829b4bd2a..ab1482444c 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -20,48 +20,26 @@ permissions:
 jobs:
   build:
     name: PHPUnit
-    runs-on: ${{ matrix.operating-system }}
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        operating-system: [ubuntu-latest, windows-latest]
-        php-version: ['7.2', '8.3']
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        php-version: ['7.2', '8.4']
         include:
           - php-version: 7.3
-            operating-system: ubuntu-latest
+            os: ubuntu-latest
           - php-version: 7.4
-            operating-system: ubuntu-latest
+            os: ubuntu-latest
           - php-version: 8.0
-            operating-system: ubuntu-latest
+            os: ubuntu-latest
           - php-version: 8.1
-            operating-system: ubuntu-latest
+            os: ubuntu-latest
           - php-version: 8.2
-            operating-system: ubuntu-latest
+            os: ubuntu-latest
+          - php-version: 8.3
+            os: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Install PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-version }}
-          tools: composer:v2
-          extensions: memcached
-      - name: "Composer install"
-        run: |
-          composer install --ignore-platform-reqs
-          composer require doctrine/cache ~1.2 --ignore-platform-reqs
-      - name: PHPUnit / PHP ${{ matrix.php-version }}
-        run: |
-          php -v
-          ./vendor/bin/phpunit
-
-  build2:
-    name: PHPUnit
-    runs-on: ${{ matrix.operating-system }}
-    strategy:
-      matrix:
-        operating-system: [macOS-latest]
-        php-version: [ '7.2', '8.3' ]
-    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Install PHP
         uses: shivammathur/setup-php@v2
         with: