Switch PHPUnit to a Composer dependency

pantheon-systems · May 9, 2019 · 5f0a9d0 · 5f0a9d0
1 parent e00be73
commit 5f0a9d0
Show file tree

Hide file tree

Showing 5 changed files with 1,581 additions and 166 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -36,16 +36,15 @@ before_script:
   - |
     if [[ ! -z "$WP_VERSION" ]] ; then
       bash bin/install-wp-tests.sh wordpress_test root '' localhost $WP_VERSION
-      composer global require "phpunit/phpunit=5.7.*"
     fi
 
 script:
   - |
     if [[ ! -z "$WP_VERSION" ]] ; then
-      phpunit
-      WP_MULTISITE=1 phpunit
+      composer test
+      WP_MULTISITE=1 composer test
     fi
   - |
     if [[ "$WP_TRAVISCI" == "phpcs" ]] ; then
-      composer phpcs
+      composer lint
     fi
diff --git a/composer.json b/composer.json
@@ -21,10 +21,14 @@
     "require-dev": {
         "pantheon-systems/pantheon-wordpress-upstream-tests": "dev-master",
         "wp-coding-standards/wpcs": "^2.1",
-        "dealerdirect/phpcodesniffer-composer-installer": "^0.5.0"
+        "dealerdirect/phpcodesniffer-composer-installer": "^0.5.0",
+        "phpunit/phpunit": "^7"
     },
     "scripts": {
-        "phpcs": "vendor/bin/phpcs"
+        "lint": "@phpcs",
+        "phpcs": "vendor/bin/phpcs",
+        "phpunit": "vendor/bin/phpunit",
+        "test": "@phpunit"
     },
     "autoload": {
         "psr-4": { "PantheonSystems\\WPSamlAuth\\Behat\\": "tests/behat/bootstrap/" }