Merge pull request #418 from pantheon-systems/update-composer-8-14-19-v2

Update Composer dependencies (2019-08-19)
pantheon-systems · Aug 14, 2019 · 2e7243e · 2e7243e
2 parents 46676f5 + 72a3117
commit 2e7243e
Show file tree

Hide file tree

Showing 3 changed files with 506 additions and 445 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,6 @@
+sudo: false
+dist: trusty
+
 language: php
 
 notifications:

diff --git a/composer.json b/composer.json
@@ -14,14 +14,19 @@
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
+    "config": {
+        "platform": {
+            "php": "7.0"
+        }
+    },
     "require": {
         "solarium/solarium": "~4"
     },
     "require-dev": {
         "pantheon-systems/pantheon-wordpress-upstream-tests": "dev-master",
         "wp-coding-standards/wpcs": "^2.1",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.5.0",
-        "phpunit/phpunit": "^7"
+        "phpunit/phpunit": "^6 || ^7"
     },
     "scripts": {
         "lint": "@phpcs",