Remove now obsolete code (#173)

.github/workflows/lint-and-test.yml

@@ -58,17 +58,27 @@ jobs:
         strategy:
             matrix:
                 php: ['8.2', '8.1', '8.0', '7.4', '7.3', '7.2', '7.1', '7.0']
-                wp: ['6.4', 'trunk']
+                wp: ['latest', 'trunk']
                 coverage: [false]
                 experimental: [false]
                 exclude:
+                    - php: '7.0'
+                      wp: 'trunk'
+                      coverage: false
+                      experimental: false
+
+                    - php: '7.1'
+                      wp: 'trunk'
+                      coverage: false
+                      experimental: false
+
                     - php: '8.2'
-                      wp: '6.4'
+                      wp: 'latest'
                       coverage: false
                       experimental: false
                 include:
                     - php: '8.2'
-                      wp: '6.4'
+                      wp: 'latest'
                       coverage: true
                       experimental: false
 
@@ -77,6 +87,11 @@ jobs:
                       coverage: true
                       experimental: true
 
+                    - php: '8.4'
+                      wp: 'trunk'
+                      coverage: false
+                      experimental: true
+
         steps:
             - name: Checkout
               uses: actions/checkout@v4
@@ -113,7 +128,7 @@ jobs:
             # See https://make.wordpress.org/core/handbook/references/phpunit-compatibility-and-wordpress-versions/
             - name: Update PHPUnit
               run: |
-                  if [[ $PHP_VERSION == "7.4" || $PHP_VERSION == "8.0" || $PHP_VERSION == "8.1" || $PHP_VERSION == "8.2" || $PHP_VERSION == "8.3" ]]; then
+                  if [[ $PHP_VERSION == "7.4" || $PHP_VERSION == "8.0" || $PHP_VERSION == "8.1" || $PHP_VERSION == "8.2" || $PHP_VERSION == "8.3" || $PHP_VERSION == "8.4" ]]; then
                     echo "Installing latest version of PHPUnit"
                     composer update --ignore-platform-reqs --no-interaction --no-scripts yoast/phpunit-polyfills --with-dependencies
                   fi
@@ -159,7 +174,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                wp: ['6.4']
+                wp: ['trunk']
         services:
             mysql:
                 image: mariadb:latest

.gitignore

@@ -5,7 +5,6 @@ vendor/
 phpcs.xml
 phpstan.neon
 phpunit.xml
-phpunit-multisite.xml
 .phpunit.cache/
 .phpunit.result.cache
 .wp-env.override.json

composer.json

@@ -54,15 +54,12 @@
 			"build-cs/vendor/bin/phpmd . text phpmd.xml"
 		],
 		"test": [
-			"@test:unit",
 			"@test:integration",
 			"@test:integration:multisite"
 		],
-		"test:unit": "vendor/bin/phpunit",
 		"test:integration": "vendor/bin/phpunit -c phpunit-integration.xml.dist",
 		"test:integration:multisite": "vendor/bin/phpunit -c phpunit-integration-multisite.xml.dist",
 		"test:coverage": [
-			"@test:unit --coverage-clover coverage.xml",
 			"@test:integration --coverage-clover coverage-integration.xml",
 			"@test:integration:multisite --coverage-clover coverage-integration-multisite.xml"
 		]