From 02ca9d772ad67456e86f73a54c749cee6c836e15 Mon Sep 17 00:00:00 2001
From: Garion Herman <garion@silverstripe.com>
Date: Wed, 26 Feb 2020 14:58:21 +1300
Subject: [PATCH 1/2] Update Travis config to include PHP 7.4 builds

---
 .travis.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 21aaac1..1361f19 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,6 +42,10 @@ matrix:
       env:
         - PHPUNIT_TEST=core
         - DB=PGSQL
+    - php: 7.4
+      env:
+        - PHPUNIT_TEST=core
+        - DB=MYSQL
     # admin php tests
     - php: 7.1
       env:
@@ -52,6 +56,10 @@ matrix:
         - PHPUNIT_TEST=admin
         - DB=MYSQL
         - PDO=1
+    - php: 7.4
+      env:
+        - PHPUNIT_TEST=admin
+        - DB=MYSQL
     # behat tests
     - php: 7.1
       env:
@@ -66,6 +74,10 @@ matrix:
         - BEHAT_TEST="@asset-admin"
         - DB=MYSQL
     - php: 7.3
+      env:
+        - HEALTH_TEST=1
+        - DB=PGSQL
+    - php: 7.4
       env:
         - HEALTH_TEST=1
         - DB=MYSQL

From 685193565243207c54c29fd9127c481360ebab74 Mon Sep 17 00:00:00 2001
From: Garion Herman <garion@silverstripe.com>
Date: Wed, 26 Feb 2020 16:45:52 +1300
Subject: [PATCH 2/2] Add sminnee/phpunit-mock-objects to fix PHP 7.4 compat

---
 composer.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 7786a64..937d349 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,8 @@
         "silverstripe-themes/simple": "~3.2.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7"
+        "phpunit/phpunit": "^5.7",
+        "sminnee/phpunit-mock-objects": "^3.4.5"
     },
     "extra": {
         "project-files": [
@@ -27,4 +28,4 @@
     },
     "prefer-stable": true,
     "minimum-stability": "dev"
-}
\ No newline at end of file
+}