chore: Update ci pipeline, remove PHPUnit as dev dependency, use PHPUnit 9.5 by default (#311)

.github/workflows/.pipeline.yml

@@ -14,18 +14,14 @@ jobs:
       fail-fast: false
       matrix:
         php: [ 7.3 ]
-        os: [ ubuntu-18.04 ]
+        os: [ ubuntu-20.04 ]
-        wordpress: [ 5.8.2 ]
+        wordpress: [ 5.9 ]
         experimental: [ false ]
         include:
           - php: 7.4
             os: ubuntu-20.04
             wordpress: latest
             experimental: true
-          - php: 7.4
-            os: ubuntu-20.04
-            wordpress: 'trunk'
-            experimental: true
     name: Test - PHP ${{ matrix.php }} - WP ${{ matrix.wordpress }}
 
     env:
@@ -89,7 +85,7 @@ jobs:
         run: bash bin/install-wp-tests.sh wordpress_test root root localhost ${{ matrix.wordpress }}
 
       - name: Run PHP Test and PCOV
-        run: composer require pcov/clobber; vendor/bin/pcov clobber; vendor/bin/phpunit --configuration phpunit.xml --coverage-clover coverage.xml
+        run: composer test-coverage
         if: matrix.experimental == false
 
       - name: Upload Coverage to Codecov
@@ -98,14 +94,7 @@ jobs:
 
       - name: Run PHP Tests
         run: composer test
-        if: matrix.experimental == true && matrix.wordpress != 'trunk'
+        if: matrix.experimental == true
-
-      - name: Run PHP Tests with PHPUnit 9
-        run: |
-          composer remove --dev phpunit/phpunit
-          composer update --dev yoast/phpunit-polyfills --with-dependencies --ignore-platform-reqs
-          vendor/bin/phpunit --configuration phpunit9.xml
-        if: matrix.experimental == true && matrix.wordpress == 'trunk'
 
       - name: Prepare Build
         if: startsWith(github.ref, 'refs/tags/')

composer.json

@@ -31,7 +31,6 @@
 		"spatie/color": "^1.1"
 	},
 	"require-dev": {
-		"phpunit/phpunit": "^7.5",
 		"pressbooks/coding-standards": "^1.1",
 		"wpreadme2markdown/wp2md": "^3.0",
 		"yoast/phpunit-polyfills": "^1.0.1"

phpunit.xml

@@ -1,23 +1,16 @@
 <?xml version="1.0"?>
-<phpunit
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="tests/bootstrap.php" backupGlobals="false" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-	bootstrap="tests/bootstrap.php"
+  <coverage>
-	backupGlobals="false"
+    <include>
-	colors="true"
+      <directory suffix=".php">./inc</directory>
-	convertErrorsToExceptions="true"
+    </include>
-	convertNoticesToExceptions="true"
+  </coverage>
-	convertWarningsToExceptions="true"
+  <php>
-	>
+    <const name="WP_TESTS_MULTISITE" value="1"/>
-	<php>
+  </php>
-		<const name="WP_TESTS_MULTISITE" value="1" />
+  <testsuites>
-	</php>
+    <testsuite name="Pressbooks Aldine">
-	<testsuites>
+      <directory prefix="test-" suffix=".php">./tests/</directory>
-		<testsuite name="Pressbooks Aldine">
+    </testsuite>
-			<directory prefix="test-" suffix=".php">./tests/</directory>
+  </testsuites>
-		</testsuite>
-	</testsuites>
-	<filter>
-		<whitelist>
-			<directory suffix=".php">./inc</directory>
-		</whitelist>
-</filter>
 </phpunit>

phpunit9.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="tests/bootstrap.php" backupGlobals="false" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage>
-    <include>
-      <directory suffix=".php">./inc</directory>
-    </include>
-  </coverage>
-  <php>
-    <const name="WP_TESTS_MULTISITE" value="1"/>
-  </php>
-  <testsuites>
-    <testsuite name="Pressbooks Aldine">
-      <directory prefix="test-" suffix=".php">./tests/</directory>
-    </testsuite>
-  </testsuites>
-</phpunit>