Merge branch 'dev'

.github/workflows/.pipeline.yml

@@ -15,17 +15,13 @@ jobs:
       matrix:
         php: [ 7.3 ]
         os: [ ubuntu-18.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:
@@ -98,24 +94,13 @@ jobs:
         run: bash bin/install-wp-tests.sh wordpress_test root root localhost ${{ matrix.wordpress }}
 
       - name: Run PHP Tests and PCOV
-        run: composer require pcov/clobber; vendor/bin/pcov clobber; vendor/bin/phpunit --configuration phpunit.xml --coverage-clover coverage.xml
+        run: vendor/bin/phpunit --configuration phpunit.xml --coverage-clover coverage.xml
         if: matrix.experimental == false
 
       - name: Upload Coverage to Codecov
         run: bash <(curl -s https://codecov.io/bash)
         if: matrix.experimental == false
 
-      - name: Run PHP Tests
-        run: composer test
-        if: matrix.experimental == true && matrix.wordpress != 'trunk'
-
-      - 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/')
         run: |

.gitignore

@@ -1,2 +1,2 @@
 node_modules
-vendor
+vendor

README.md

@@ -16,8 +16,8 @@ This theme is named after Canadian media theorist Marshall McLuhan, who coined t
 ## Requirements
 
 * PHP >= 7.3
-* WordPress >= 5.8.2
-* Pressbooks >= 5.31.0
+* WordPress >= 5.9
+* Pressbooks >= 5.32.0
 
 ## Installation
 
@@ -41,7 +41,7 @@ Then, from the GitHub Updater interface, navigate to the "Install Theme" tab. En
 
 ## Changelog
 
-### 2.15.0
+### 2.16.0
 
-* See: https://github.com/pressbooks/pressbooks-book/releases/tag/2.15.0
+* See: https://github.com/pressbooks/pressbooks-book/releases/tag/2.16.0
 * Full release history available at: https://github.com/pressbooks/pressbooks-book/releases

composer.json

@@ -16,9 +16,8 @@
 	},
 	"require-dev": {
 		"pressbooks/coding-standards": "^1.1",
-    "wpreadme2markdown/wp2md": "^3.0",
-		"phpunit/phpunit": "^7.5",
-		"yoast/phpunit-polyfills": "^1.0.1"
+ 		"wpreadme2markdown/wp2md": "^3.0",
+		"yoast/phpunit-polyfills": "^1.0.3"
 	},
 	"archive": {
 		"exclude": [".github", ".tx", "bin"]