Merge pull request #285 from creative-commoners/pulls/4.6/travis

Update travis 4.6

.travis.yml

@@ -20,8 +20,7 @@ addons:
 
 env:
   global:
-    - TRAVIS_NODE_VERSION="6"
+    - COMPOSER_ROOT_VERSION="4.6.x-dev"
-    - COMPOSER_ROOT_VERSION="4.x-dev"
     - SS_BASE_URL="http://localhost:8080/"
     - SS_ENVIRONMENT_TYPE="dev"
 
@@ -30,58 +29,31 @@ matrix:
   include:
     # Core php tests
     - php: 7.1
-      env:
+      env: DB=MYSQL PHPUNIT_TEST=core PDO=1
-        - PHPUNIT_TEST=core
-        - DB=MYSQL
-        - PDO=1
     - php: 7.2
-      env:
+      env: DB=MYSQL PHPUNIT_TEST=framework
-        - PHPUNIT_TEST=framework
-        - DB=MYSQL
     - php: 7.3
-      env:
+      env: DB=PGSQL PHPUNIT_TEST=core
-        - PHPUNIT_TEST=core
-        - DB=PGSQL
     - php: 7.4
-      env:
+      env: DB=MYSQL PHPUNIT_TEST=core
-        - PHPUNIT_TEST=core
-        - DB=MYSQL
     # admin php tests
     - php: 7.1
-      env:
+      env: DB=MYSQL PHPUNIT_TEST=admin PDO=1
-        - PHPUNIT_TEST=admin
-        - DB=PGSQL
     - php: 7.2
-      env:
+      env: DB=PGSQL PHPUNIT_TEST=admin
-        - PHPUNIT_TEST=admin
-        - DB=MYSQL
-        - PDO=1
     - php: 7.4
-      env:
+      env: DB=MYSQL PHPUNIT_TEST=admin
-        - PHPUNIT_TEST=admin
-        - DB=MYSQL
     # behat tests
     - php: 7.1
-      env:
+      env: DB=MYSQL BEHAT_TEST="@framework"
-        - BEHAT_TEST="@framework"
-        - DB=MYSQL
     - php: 7.2
-      env:
+      env: DB=MYSQL BEHAT_TEST="@cms"
-        - BEHAT_TEST="@cms"
-        - DB=MYSQL
     - php: 7.3
-      env:
+      env: DB=MYSQL BEHAT_TEST="@asset-admin"
-        - BEHAT_TEST="@asset-admin"
-        - DB=MYSQL
     - php: 7.3
-      env:
+      env: DB=PGSQL HEALTH_TEST=1
-        - HEALTH_TEST=1
-        - DB=PGSQL
     - php: 7.4
-      env:
+      env: DB=MYSQL HEALTH_TEST=1 PDO=1
-        - HEALTH_TEST=1
-        - DB=MYSQL
-        - PDO=1
 
 before_script:
 # Extra $PATH
@@ -99,7 +71,9 @@ before_script:
 
 # Install composer dependencies
   - composer validate
-  - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.x-dev; fi
+  # Fix for running phpunit 5 on php 7.4+
+  - composer require --no-update sminnee/phpunit-mock-objects:^3
+  - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:^2; fi
   - if [[ $BEHAT_TEST ]]; then composer require --no-update silverstripe/recipe-testing:^1; fi;
   - if [[ $BEHAT_TEST == "@asset-admin" ]]; then composer require --no-update silverstripe/frameworktest:^0.1.0; fi;
   - if [[ $HEALTH_TEST ]]; then composer require --no-update silverstripe/serve:^2; fi;