From 8c72d73bef850aa137e0fe88971ff4092f2f983e Mon Sep 17 00:00:00 2001
From: Alec Geatches <alec.geatches@automattic.com>
Date: Mon, 22 Apr 2024 13:40:50 -0600
Subject: [PATCH] Update integration tests to use WordPress 5.9

---
 .github/workflows/integrate.yml | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/integrate.yml b/.github/workflows/integrate.yml
index 2b607191..87f764e5 100644
--- a/.github/workflows/integrate.yml
+++ b/.github/workflows/integrate.yml
@@ -13,22 +13,18 @@ jobs:
 
     strategy:
       matrix:
-        wordpress: [ '5.7', '6.3' ]
-        php: [ '7.4', '8.0', '8.2' ]
+        wordpress: [ '5.9', '6.5' ]
+        php: [ '7.4', 'latest' ]
         allowed_failure: [ false ]
         include:
           # Check upcoming WP.
-          - php: '8.2'
+          - php: 'latest'
             wordpress: 'trunk'
             allowed_failure: true
           # Check upcoming PHP.
-          - php: '8.3'
+          - php: '8.4'
             wordpress: 'latest'
             allowed_failure: true
-        exclude:
-          # WordPress 5.7 doesn't support PHP 8.2.
-          - php: '8.2'
-            wordpress: '5.7'
       fail-fast: false
 
     steps:
@@ -43,11 +39,6 @@ jobs:
           ini-values: ${{ matrix.ini-values }}
           coverage: ${{ matrix.coverage }}
 
-      - name: Install PHPUnit 7.x for WP < 5.9
-        if: ${{ matrix.wordpress < 5.9 }}
-        # Ignore platform requirements, so that PHPUnit 7.5 can be installed on PHP 8.0 (and above).
-        run: composer require --dev phpunit/phpunit:"^7.5" --ignore-platform-req=php+ --no-update --no-scripts --no-interaction
-
       - name: Install Composer dependencies
         uses: ramsey/composer-install@v2
         with: