Phpunit Upgrade (fixes #188) (#196)

And improving some unit tests

Author: benjaminpick

.gitignore

@@ -15,6 +15,7 @@ wp-cli.local.yml
 /coverage
 /.parcel-cache
 /babel.config.json
+/.phpunit.result.cache
 
 /lib/vendor
 

.travis.yml

@@ -24,30 +24,30 @@ env:
     - WP_DB_NAME=wp_tests
     - WP_VERSION=*
     - CF7_VERSION=v5.5.3
+    - PHPUNIT_VERSION=*
 
 php:
   - 8.0
-  - 7.4
   - 7.3
-  - 7.2
 
 jobs:
   fast_finish: true
   include:
-    - name: legacy
+    - name: php_7_2
       php: 7.2
-      env: WP_VERSION=5.4 CF7_VERSION=v5.1.6
+      env: PHPUNIT_VERSION=^7.0
+    - name: php_7_2_and_wp_5_4
+      php: 7.2
+      env: WP_VERSION=5.4.9 CF7_VERSION=v5.1.6 PHPUNIT_VERSION=^7.0
     - name: bleeding edge
       php: 8.1.0
       dist: focal
       env: CF7_VERSION=master
-  allow_failures:
-    - name: bleeding edge
 
 install:
   - composer validate
-  - composer require --ignore-platform-reqs --dev roots/wordpress:${WP_VERSION} wp-phpunit/wp-phpunit:${WP_VERSION}
-  - composer install --ignore-platform-reqs
+  - composer require --dev --with-dependencies roots/wordpress:${WP_VERSION} wp-phpunit/wp-phpunit:${WP_VERSION} phpunit/phpunit:${PHPUNIT_VERSION}
+  - composer install
   - composer show
   - nvm install 12 && nvm use 12
   - yarn install

composer.json

@@ -21,15 +21,15 @@
         "symfony/http-foundation": "5.2.4"
     },
     "require-dev": {
-        "phpunit/phpunit": "7.5.20",
         "roots/wordpress": "5.9",
         "wp-phpunit/wp-phpunit": "5.9.0",
         "yoast/phpunit-polyfills": "1.0.3"
     },
     "scripts": {
         "test": "phpunit",
         "install-test": "composer install --ignore-platform-reqs",
-        "test-install": "composer install --ignore-platform-reqs && git update-index --assume-unchanged vendor/composer/autoload_* vendor/composer/installed.json"
+        "install-prod": "composer install --ignore-platform-reqs --no-dev",
+        "test-install": "composer install --ignore-platform-reqs && git update-index --assume-unchanged vendor/composer/autoload_*"
     },
     "config": {
         "allow-plugins": {