[2.1] Fix PHP 8 unit test GHA job

bin/ci/after-wp-install.sh

@@ -42,41 +42,3 @@ if [[ -n $INSTALL_PWA_PLUGIN ]]; then
 	unzip -d "$WP_CORE_DIR/src/wp-content/plugins/" "$WP_CORE_DIR/src/wp-content/plugins/pwa.zip"
 	echo "done"
 fi
-
-if [[ $(php -r "echo PHP_VERSION;") == 8.0* ]]; then
-	echo "Installing compatible PHPUnit for use with PHP 8..."
-
-	DIFF=$(
-		cat <<-EOF
-diff --git a/composer.json b/composer.json
-index 5934aedec..2977df4a9 100644
---- a/composer.json
-+++ b/composer.json
-@@ -86,7 +86,17 @@
-     ],
-     "files": [
-       "tests/php/register-wp-cli-commands.php",
--      "docs/includes/register-wp-cli-commands.php"
-+      "docs/includes/register-wp-cli-commands.php",
-+      "${WP_TESTS_DIR}/includes/phpunit7/MockObject/Builder/NamespaceMatch.php",
-+      "${WP_TESTS_DIR}/includes/phpunit7/MockObject/Builder/ParametersMatch.php",
-+      "${WP_TESTS_DIR}/includes/phpunit7/MockObject/InvocationMocker.php",
-+      "${WP_TESTS_DIR}/includes/phpunit7/MockObject/MockMethod.php"
-+    ],
-+    "exclude-from-classmap": [
-+      "vendor/phpunit/phpunit/src/Framework/MockObject/Builder/NamespaceMatch.php",
-+      "vendor/phpunit/phpunit/src/Framework/MockObject/Builder/ParametersMatch.php",
-+      "vendor/phpunit/phpunit/src/Framework/MockObject/InvocationMocker.php",
-+      "vendor/phpunit/phpunit/src/Framework/MockObject/MockMethod.php"
-     ]
-   },
-   "repositories": [
-		EOF
-	)
-
-	echo "${DIFF}" | git apply -
-	composer require --dev --ignore-platform-reqs --update-with-dependencies phpunit/phpunit:^7.5
-
-	PATH="$(composer config bin-dir --absolute):$PATH"
-	echo "done"
-fi

composer.json

@@ -30,14 +30,14 @@
     "php-stubs/wordpress-stubs": "^5.3.2",
     "phpcompatibility/phpcompatibility-wp": "2.1.1",
     "phpdocumentor/reflection": "~3.0",
-    "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5",
     "roave/security-advisories": "dev-latest",
     "sirbrillig/phpcs-variable-analysis": "2.11.0",
     "wp-cli/export-command": "^2.0",
     "wp-cli/extension-command": "^2.0",
     "wp-cli/wp-cli": "^2.4",
     "wp-cli/wp-cli-tests": "^3.0.11",
-    "wp-coding-standards/wpcs": "2.3.0"
+    "wp-coding-standards/wpcs": "2.3.0",
+    "yoast/wp-test-utils": "^0.2.2"
   },
   "suggest": {
     "ext-intl": "Enables use of idn_to_utf8() to convert punycode domains to UTF-8 for use with an AMP Cache.",
@@ -58,6 +58,9 @@
       }
     },
     "patches": {
+      "phpunit/phpunit-mock-objects": {
+        "Fix ReflectionParameter warnings on PHP 8": "patches/phpunit-mock-objects.patch"
+      },
       "sabberworm/php-css-parser": {
         "1. Add additional validation for size unit <https://github.com/sabberworm/PHP-CSS-Parser/pull/193>": "https://github.com/sabberworm/PHP-CSS-Parser/compare/3bc5ded67d77a52b81608cfc97f23b1bb0678e2f%5E...468da3441945e9c1bf402a3340b1d8326723f7d9.patch",
         "2. Validate name-start code points for identifier <https://github.com/sabberworm/PHP-CSS-Parser/pull/185>": "https://github.com/sabberworm/PHP-CSS-Parser/compare/d42b64793f2edaffeb663c63e9de79069cdc0831%5E...113df5d55e94e21c6402021dfa959924941d4c29.patch",