Merge pull request #1035 from Automattic/fix/minimum-wordpress-version

Increase minimum WordPress version to 5.9
Automattic · Apr 28, 2024 · 3ddc38c · 3ddc38c
2 parents 5578234 + fa6df03
commit 3ddc38c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 20 deletions.
diff --git a/.github/workflows/integrate.yml b/.github/workflows/integrate.yml
@@ -13,22 +13,23 @@ jobs:
 
     strategy:
       matrix:
-        wordpress: [ '5.7', '6.3' ]
-        php: [ '7.4', '8.0', '8.2' ]
-        allowed_failure: [ false ]
         include:
+          # Check lowest supported WP version, with the lowest supported PHP.
+          - wordpress: '5.9'
+            php: '7.4'
+            allowed_failure: false
+          # Check latest WP with the highest supported PHP.
+          - wordpress: 'latest'
+            php: 'latest'
+            allowed_failure: false
           # Check upcoming WP.
-          - php: '8.2'
-            wordpress: 'trunk'
+          - wordpress: 'trunk'
+            php: 'latest'
             allowed_failure: true
-          # Check upcoming PHP.
-          - php: '8.3'
-            wordpress: 'latest'
-            allowed_failure: true
-        exclude:
-          # WordPress 5.7 doesn't support PHP 8.2.
-          - php: '8.2'
-            wordpress: '5.7'
+          # Check upcoming PHP - only needed when a new version has been forked (typically Sep-Nov)
+#          - wordpress: 'trunk'
+#            php: 'nightly'
+#            allowed_failure: true
       fail-fast: false
 
     steps:
@@ -43,11 +44,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:

diff --git a/co-authors-plus.php b/co-authors-plus.php
@@ -12,7 +12,7 @@
  * Plugin URI:        https://wordpress.org/plugins/co-authors-plus/
  * Description:       Allows multiple authors to be assigned to a post. This plugin is an extended version of the Co-Authors plugin developed by Weston Ruter.
  * Version:           3.6.1
- * Requires at least: 5.7
+ * Requires at least: 5.9
  * Requires PHP:      7.4
  * Author:            Mohammad Jangda, Daniel Bachhuber, Automattic
  * Author URI:        https://automattic.com

diff --git a/composer.json b/composer.json
@@ -31,7 +31,7 @@
 		"dms/phpunit-arraysubset-asserts": "^0.5.0",
 		"php-parallel-lint/php-parallel-lint": "^1.0",
 		"phpcompatibility/phpcompatibility-wp": "^2.1",
-		"phpunit/phpunit": "^5 || ^6 || ^7 || ^8 || ^9",
+		"phpunit/phpunit": "^9",
 		"squizlabs/php_codesniffer": "^3.5",
 		"wp-cli/extension-command": "^2.0",
 		"wp-cli/wp-cli-tests": "^3",