Merge pull request #376 from creative-commoners/pulls/1.5/php-7.4-builds

Update Travis config to include PHP 7.4 build
silverstripe · Feb 20, 2020 · e660e76 · e660e76
2 parents af3b75f + 96b0992
commit e660e76
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -20,12 +20,12 @@ matrix:
       env: DB=MYSQL PHPUNIT_TEST=1
     - php: 7.3
       env: DB=MYSQL PHPUNIT_TEST=1
+    - php: 7.4
+      env: DB=MYSQL PHPUNIT_TEST=1
     - php: 7.1
       env: DB=MYSQL PHPUNIT_COVERAGE_TEST=1 PHPCS_TEST=1
     - php: 7.2
       env: DB=MYSQL PHPUNIT_TEST=1 PDO=1
-    - php: 7.3
-      env: DB=MYSQL PHPUNIT_TEST=1
     - php: 7.3
       env: DB=PGSQL PHPUNIT_TEST=1
 

diff --git a/composer.json b/composer.json
@@ -25,6 +25,7 @@
     },
     "require-dev": {
         "silverstripe/versioned": "^1@dev",
+        "sminnee/phpunit-mock-objects": "^3.4.5",
         "phpunit/phpunit": "^5.7"
     },
     "suggest": {