Merge branch '3.0' into 3.1

.travis.yml

@@ -1,21 +1,21 @@
 # See https://github.com/silverstripe/silverstripe-travis-support for setup details
 
-sudo: false
+dist: trusty
 
 language: php
 
 matrix:
   include:
-    - php: 5.6
-      env: DB=MYSQL CORE_RELEASE=3.5
-    - php: 5.6
+    - php: '5.6'
       env: DB=MYSQL CORE_RELEASE=3.6
-    - php: 5.6
+    - php: '7.0'
+      env: DB=MYSQL CORE_RELEASE=3.7
+    - php: '7.1'
+      env: DB=MYSQL CORE_RELEASE=3.7
+    - php: '7.2'
+      env: DB=PGSQL CORE_RELEASE=3.7
+    - php: '7.3'
       env: DB=MYSQL CORE_RELEASE=3.7
-    - php: 7.0
-      env: DB=PGSQL CORE_RELEASE=3
-    - php: 7.1
-      env: DB=PGSQL CORE_RELEASE=3
 
 before_script:
   - composer self-update || true

composer.json

@@ -24,6 +24,9 @@
         "silverstripe/framework": "~3.1",
         "silverstripe/cms": "~3.1"
     },
+    "require-dev": {
+        "phpunit/phpunit": "^5.7"
+    },
     "suggest": {
         "silverstripe/queuedjobs": "Automatically schedules content review emails to be sent, only requiring one crontask to be created"
     },